From e77334960a32d4d1481cf3a533204454c1b0d742 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 16 Feb 2016 20:45:29 -0500 Subject: [PATCH] OpenGL: Correct boolean vector strcmp strings for uniforms --- CHANGES | 1 + src/platform/opengl/gles2.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index c8385a7fa..d9ead01f8 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,7 @@ Bugfixes: - Qt: Fix sending gameStopped twice - Qt: Fix hang if audio sync is enabled and audio fails to initialize - GBA BIOS: Fix RegisterRamReset setting DISPCNT to the wrong value + - OpenGL: Correct boolean vector strcmp strings for uniforms Misc: - GBA: Slightly optimize GBAProcessEvents diff --git a/src/platform/opengl/gles2.c b/src/platform/opengl/gles2.c index 07d7b3317..76ba43b04 100644 --- a/src/platform/opengl/gles2.c +++ b/src/platform/opengl/gles2.c @@ -743,11 +743,11 @@ static bool _loadUniform(struct Configuration* description, size_t pass, struct uniform->type = GL_INT_VEC4; } else if (!strcmp(type, "bool")) { uniform->type = GL_BOOL; - } else if (!strcmp(type, "int2")) { + } else if (!strcmp(type, "bool2")) { uniform->type = GL_BOOL_VEC2; - } else if (!strcmp(type, "int3")) { + } else if (!strcmp(type, "bool3")) { uniform->type = GL_BOOL_VEC3; - } else if (!strcmp(type, "int4")) { + } else if (!strcmp(type, "bool4")) { uniform->type = GL_BOOL_VEC4; } else { return false;