duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get OpenGL ES 2.0 working again

Browse source
This commit is contained in:
Clownacy 2020-03-31 22:14:57 +01:00
parent 5dbca99e19
commit 073712017f
4 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -334,8 +334,12 @@ endif()
if(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGL3") if(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGL3")
target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGL3.cpp") target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGL3.cpp")
elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGLES2")
target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGLES2.cpp")
elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGL3") elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGL3")
target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGL3.cpp") target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGL3.cpp")
elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGLES2")
target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGLES2.cpp")
else() else()
message(FATAL_ERROR "Invalid BACKEND_PLATFORM/BACKEND_RENDERER combination") message(FATAL_ERROR "Invalid BACKEND_PLATFORM/BACKEND_RENDERER combination")
endif() endif()

3
src/Backends/Window/GLFW3-OpenGL3.cpp
View file

@ -25,10 +25,11 @@ void WindowSizeCallback(GLFWwindow *window, int width, int height);
Backend_Surface* Backend_Init(const char *window_title, int screen_width, int screen_height, BOOL fullscreen) Backend_Surface* Backend_Init(const char *window_title, int screen_width, int screen_height, BOOL fullscreen)
{ {
#ifdef USE_OPENGLES2 #ifdef USE_OPENGLES2
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_ES); glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API);
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
#else #else
glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE); glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);

2
src/Backends/Window/GLFW3-OpenGLES2.cpp Normal file
View file

@ -0,0 +1,2 @@
#define USE_OPENGLES2
#include "GLFW3-OpenGL3.cpp"

2
src/Backends/Window/SDL2-OpenGLES2.cpp Normal file
View file

@ -0,0 +1,2 @@
#define USE_OPENGLES2
#include "SDL2-OpenGL3.cpp"