github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert unneeded changes

Browse source
This commit is contained in:
David Chavez 2022-05-31 00:29:01 +02:00
commit 1232e0038d
5 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
View file

@ -1,7 +1,5 @@
#include "../../Window.h" #include "../../Window.h"
#ifdef ENABLE_OPENGL #ifdef ENABLE_OPENGL
#endif
#if 1
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@ -460,13 +458,12 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
vs_buf[vs_len] = '\0'; vs_buf[vs_len] = '\0';
fs_buf[fs_len] = '\0'; fs_buf[fs_len] = '\0';
/*puts("Vertex shader:"); /*puts("Vertex shader:");
puts(vs_buf); puts(vs_buf);
puts("Fragment shader:"); puts("Fragment shader:");
puts(fs_buf); puts(fs_buf);
puts("End");*/ puts("End");*/
const GLchar *sources[2] = { vs_buf, fs_buf }; const GLchar *sources[2] = { vs_buf, fs_buf };
const GLint lengths[2] = { (GLint) vs_len, (GLint) fs_len }; const GLint lengths[2] = { (GLint) vs_len, (GLint) fs_len };
GLint success; GLint success;
@ -479,9 +476,9 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
GLint max_length = 0; GLint max_length = 0;
glGetShaderiv(vertex_shader, GL_INFO_LOG_LENGTH, &max_length); glGetShaderiv(vertex_shader, GL_INFO_LOG_LENGTH, &max_length);
char error_log[1024]; char error_log[1024];
fprintf(stderr, "Vertex shader compilation failed\n"); //fprintf(stderr, "Vertex shader compilation failed\n");
glGetShaderInfoLog(vertex_shader, max_length, &max_length, &error_log[0]); glGetShaderInfoLog(vertex_shader, max_length, &max_length, &error_log[0]);
fprintf(stderr, "%s\n", &error_log[0]); //fprintf(stderr, "%s\n", &error_log[0]);
abort(); abort();
} }

11
libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp
View file

@ -139,17 +139,6 @@ static void gfx_sdl_init(const char *game_name, bool start_in_fullscreen) {
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
#if 0
#ifdef __APPLE__
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
// This is important on macOS
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
// specify depth buffer, etc
#endif
#endif
#ifndef __linux #ifndef __linux
#ifndef __APPLE__ #ifndef __APPLE__
timer = CreateWaitableTimer(nullptr, false, nullptr); timer = CreateWaitableTimer(nullptr, false, nullptr);

2
libultraship/libultraship/Lib/ImGui/backends/imgui_impl_glfw.cpp
View file

@ -126,7 +126,7 @@ struct ImGui_ImplGlfw_Data
GLFWcharfun PrevUserCallbackChar; GLFWcharfun PrevUserCallbackChar;
GLFWmonitorfun PrevUserCallbackMonitor; GLFWmonitorfun PrevUserCallbackMonitor;
ImGui_ImplGlfw_Data() { /*memset(this, 0, sizeof(*this));*/ } ImGui_ImplGlfw_Data() { memset(this, 0, sizeof(*this)); }
}; };
// Backend data stored in io.BackendPlatformUserData to allow support for multiple Dear ImGui contexts // Backend data stored in io.BackendPlatformUserData to allow support for multiple Dear ImGui contexts

4
libultraship/libultraship/Lib/ImGui/backends/imgui_impl_opengl3.cpp
View file

@ -216,13 +216,11 @@ bool ImGui_ImplOpenGL3_Init(const char* glsl_version)
IM_ASSERT(io.BackendRendererUserData == NULL && "Already initialized a renderer backend!"); IM_ASSERT(io.BackendRendererUserData == NULL && "Already initialized a renderer backend!");
// Initialize our loader // Initialize our loader
#if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) && !defined(IMGUI_IMPL_OPENGL_LOADER_CUSTOM) || 0 #if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) && !defined(IMGUI_IMPL_OPENGL_LOADER_CUSTOM)
if (imgl3wInit() != 0) if (imgl3wInit() != 0)
{ {
fprintf(stderr, "Failed to initialize OpenGL loader!\n"); fprintf(stderr, "Failed to initialize OpenGL loader!\n");
#ifndef __APPLE__ // this is ok due to shared library cache
return false; return false;
#endif
} }
#endif #endif

4
libultraship/libultraship/Lib/ImGui/backends/imgui_impl_opengl3_loader.h
View file

@ -652,8 +652,12 @@ static int parse_version(void)
return GL3W_ERROR_INIT; return GL3W_ERROR_INIT;
glGetIntegerv(GL_MAJOR_VERSION, &version.major); glGetIntegerv(GL_MAJOR_VERSION, &version.major);
glGetIntegerv(GL_MINOR_VERSION, &version.minor); glGetIntegerv(GL_MINOR_VERSION, &version.minor);
#ifndef __APPLE__
if (version.major < 3) if (version.major < 3)
return GL3W_ERROR_OPENGL_VERSION; return GL3W_ERROR_OPENGL_VERSION;
#endif
return GL3W_OK; return GL3W_OK;
} }