From 57df81e425bc8bb874f7ebf5733660b63abdb5f4 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 18 Jun 2024 18:03:02 -0400 Subject: [PATCH] Update --- .../gles-compatibility-layer/CMakeLists.txt | 3 --- dependencies/gles-compatibility-layer/src | 2 +- media-layer/trampoline/src/GLESv1_CM.cpp | 15 ++++----------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dependencies/gles-compatibility-layer/CMakeLists.txt b/dependencies/gles-compatibility-layer/CMakeLists.txt index 73bb0668..8c561688 100644 --- a/dependencies/gles-compatibility-layer/CMakeLists.txt +++ b/dependencies/gles-compatibility-layer/CMakeLists.txt @@ -1,7 +1,4 @@ project(gles-compatibility-layer) # GLES Compatibility Layer -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(src) diff --git a/dependencies/gles-compatibility-layer/src b/dependencies/gles-compatibility-layer/src index 3ee682f6..53977435 160000 --- a/dependencies/gles-compatibility-layer/src +++ b/dependencies/gles-compatibility-layer/src @@ -1 +1 @@ -Subproject commit 3ee682f6f26dd4344f0701ae346d10250c040d8e +Subproject commit 539774351723333d1248f8ab8461e07ffd1e06e3 diff --git a/media-layer/trampoline/src/GLESv1_CM.cpp b/media-layer/trampoline/src/GLESv1_CM.cpp index 68644394..a5b37418 100644 --- a/media-layer/trampoline/src/GLESv1_CM.cpp +++ b/media-layer/trampoline/src/GLESv1_CM.cpp @@ -546,8 +546,7 @@ static int get_glGetFloatv_params_size(GLenum pname) { case GL_PROJECTION_MATRIX: { return 16; } - case GL_ALIASED_LINE_WIDTH_RANGE: - case GL_SMOOTH_LINE_WIDTH_RANGE: { + case GL_ALIASED_LINE_WIDTH_RANGE: { return 2; } default: { @@ -660,17 +659,11 @@ CALL(56, glViewport, void, (GLint x, GLint y, GLsizei width, GLsizei height)) #endif } -CALL(57, glNormal3f, void, (GLfloat nx, GLfloat ny, GLfloat nz)) #ifdef MEDIA_LAYER_TRAMPOLINE_GUEST - trampoline(true, nx, ny, nz); -#else - GLfloat nx = args.next(); - GLfloat ny = args.next(); - GLfloat nz = args.next(); - func(nx, ny, nz); - return 0; -#endif +void glNormal3f(__attribute__((unused)) GLfloat nx, __attribute__((unused)) GLfloat ny, __attribute__((unused)) GLfloat nz) { + // Do Nothing } +#endif CALL(58, glIsEnabled, GLboolean, (GLenum cap)) #ifdef MEDIA_LAYER_TRAMPOLINE_GUEST