ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix OpenGL 2.1 support (fixes #1678)

This commit is contained in:
Vicki Pfau 2020-02-28 18:27:13 -08:00
parent 2b4b9ce66e
commit 94ac311829
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -6,6 +6,7 @@ Emulation fixes:
Other fixes: Other fixes:
- Core: Fix ELF loading regression (fixes mgba.io/i/1669) - Core: Fix ELF loading regression (fixes mgba.io/i/1669)
- Core: Fix crash modifying hash table entry (fixes mgba.io/i/1673) - Core: Fix crash modifying hash table entry (fixes mgba.io/i/1673)
- Qt: Fix OpenGL 2.1 support (fixes mgba.io/i/1678)
Misc: Misc:
- Qt: Disable Replace ROM option when no game loaded - Qt: Disable Replace ROM option when no game loaded
- Qt: Defer texture updates until frame is drawn (fixes mgba.io/i/1590) - Qt: Defer texture updates until frame is drawn (fixes mgba.io/i/1590)

13
src/platform/opengl/gles2.c
View File

@ -21,6 +21,9 @@ static const GLchar* const _gles2Header =
"#version 100\n" "#version 100\n"
"precision mediump float;\n"; "precision mediump float;\n";
static const GLchar* const _gl2Header =
"#version 120\n";
static const GLchar* const _gl32VHeader = static const GLchar* const _gl32VHeader =
"#version 150 core\n" "#version 150 core\n"
"#define attribute in\n" "#define attribute in\n"
@ -462,10 +465,12 @@ void mGLES2ShaderInit(struct mGLES2Shader* shader, const char* vs, const char* f
shader->fragmentShader = glCreateShader(GL_FRAGMENT_SHADER); shader->fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);
const GLchar* shaderBuffer[2]; const GLchar* shaderBuffer[2];
const GLubyte* version = glGetString(GL_VERSION); const GLubyte* version = glGetString(GL_VERSION);
if (strncmp((const char*) version, "OpenGL ES ", strlen("OpenGL ES "))) { if (strncmp((const char*) version, "OpenGL ES ", strlen("OpenGL ES ")) == 0) {
shaderBuffer[0] = _gl32VHeader;
} else {
shaderBuffer[0] = _gles2Header; shaderBuffer[0] = _gles2Header;
} else if (version[0] == '2') {
shaderBuffer[0] = _gl2Header;
} else {
shaderBuffer[0] = _gl32VHeader;
} }
if (vs) { if (vs) {
shaderBuffer[1] = vs; shaderBuffer[1] = vs;
@ -474,7 +479,7 @@ void mGLES2ShaderInit(struct mGLES2Shader* shader, const char* vs, const char* f
} }
glShaderSource(shader->vertexShader, 2, shaderBuffer, 0); glShaderSource(shader->vertexShader, 2, shaderBuffer, 0);
if (strncmp((const char*) version, "OpenGL ES ", strlen("OpenGL ES "))) { if (shaderBuffer[0] == _gl32VHeader) {
shaderBuffer[0] = _gl32FHeader; shaderBuffer[0] = _gl32FHeader;
} }
if (fs) { if (fs) {