From 073712017f33838f6270a108fc11c5099d6a0783 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 31 Mar 2020 22:14:57 +0100 Subject: [PATCH] Get OpenGL ES 2.0 working again --- CMakeLists.txt | 4 ++++ src/Backends/Window/GLFW3-OpenGL3.cpp | 3 ++- src/Backends/Window/GLFW3-OpenGLES2.cpp | 2 ++ src/Backends/Window/SDL2-OpenGLES2.cpp | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/Backends/Window/GLFW3-OpenGLES2.cpp create mode 100644 src/Backends/Window/SDL2-OpenGLES2.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fc69037..43773d2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -334,8 +334,12 @@ endif() if(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGL3") 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") 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() message(FATAL_ERROR "Invalid BACKEND_PLATFORM/BACKEND_RENDERER combination") endif() diff --git a/src/Backends/Window/GLFW3-OpenGL3.cpp b/src/Backends/Window/GLFW3-OpenGL3.cpp index 82e814d8..b8a840cb 100644 --- a/src/Backends/Window/GLFW3-OpenGL3.cpp +++ b/src/Backends/Window/GLFW3-OpenGL3.cpp @@ -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) { #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_MINOR, 0); #else + glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); diff --git a/src/Backends/Window/GLFW3-OpenGLES2.cpp b/src/Backends/Window/GLFW3-OpenGLES2.cpp new file mode 100644 index 00000000..dd6c2b04 --- /dev/null +++ b/src/Backends/Window/GLFW3-OpenGLES2.cpp @@ -0,0 +1,2 @@ +#define USE_OPENGLES2 +#include "GLFW3-OpenGL3.cpp" diff --git a/src/Backends/Window/SDL2-OpenGLES2.cpp b/src/Backends/Window/SDL2-OpenGLES2.cpp new file mode 100644 index 00000000..6c480c10 --- /dev/null +++ b/src/Backends/Window/SDL2-OpenGLES2.cpp @@ -0,0 +1,2 @@ +#define USE_OPENGLES2 +#include "SDL2-OpenGL3.cpp"