all repos — mgba @ e77334960a32d4d1481cf3a533204454c1b0d742

mGBA Game Boy Advance Emulator

OpenGL: Correct boolean vector strcmp strings for uniforms
Lioncash mathew1800@gmail.com
Tue, 16 Feb 2016 20:45:29 -0500
commit

e77334960a32d4d1481cf3a533204454c1b0d742

parent

5c2dbc59a1df816dc836ef2c05abae02bd543dbd

2 files changed, 4 insertions(+), 3 deletions(-)

jump to
M CHANGESCHANGES

@@ -6,6 +6,7 @@ - VFS: Fix reading 7z archives without rewinding first

- 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
M src/platform/opengl/gles2.csrc/platform/opengl/gles2.c

@@ -743,11 +743,11 @@ } else if (!strcmp(type, "int4")) {

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;