From 9e517f5e6048f694547586e12521ab10ddfe2ae2 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Thu, 7 Sep 2023 21:38:14 -0400 Subject: [PATCH] The Return Of ES2 Support --- media-layer/core/gles/dependencies/CMakeLists.txt | 1 + media-layer/core/gles/dependencies/gles-compatibility-layer | 2 +- media-layer/core/src/media.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/media-layer/core/gles/dependencies/CMakeLists.txt b/media-layer/core/gles/dependencies/CMakeLists.txt index 9f8be98..3e44310 100644 --- a/media-layer/core/gles/dependencies/CMakeLists.txt +++ b/media-layer/core/gles/dependencies/CMakeLists.txt @@ -3,6 +3,7 @@ project(media-layer-core-gles-dependencies) # GLES Compatibility Layer if(NOT MCPI_HEADLESS_MODE AND MCPI_USE_GLES1_COMPATIBILITY_LAYER) set(GLES_COMPATIBILITY_LAYER_USE_DEFAULT_INCLUDE_PATH FALSE CACHE BOOL "" FORCE) + set(GLES_COMPATIBILITY_LAYER_USE_ES3 FALSE CACHE BOOL "" FORCE) set(GLES_COMPATIBILITY_LAYER_USE_SDL FALSE CACHE BOOL "" FORCE) set(GLES_COMPATIBILITY_LAYER_DEPENDENCY glfw CACHE STRING "" FORCE) add_subdirectory(gles-compatibility-layer) diff --git a/media-layer/core/gles/dependencies/gles-compatibility-layer b/media-layer/core/gles/dependencies/gles-compatibility-layer index 3078b26..86dadd6 160000 --- a/media-layer/core/gles/dependencies/gles-compatibility-layer +++ b/media-layer/core/gles/dependencies/gles-compatibility-layer @@ -1 +1 @@ -Subproject commit 3078b267561053af3b590407ef60f8b4beae18bd +Subproject commit 86dadd6644d454b1c5460d7110a89c54cbdd2507 diff --git a/media-layer/core/src/media.c b/media-layer/core/src/media.c index b094484..bfe12cf 100644 --- a/media-layer/core/src/media.c +++ b/media-layer/core/src/media.c @@ -577,7 +577,7 @@ void SDL_WM_SetCaption(const char *title, __attribute__((unused)) const char *ic // Create OpenGL ES Context glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API); #ifdef MCPI_USE_GLES1_COMPATIBILITY_LAYER - glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); + glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); #else glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 1);