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

OpenGL: Minor gles2 fixes

This commit is contained in:
Jeffrey Pfau 2015-11-08 15:30:23 -08:00
parent ad3ec31f73
commit ac481d0c1b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,6 +139,7 @@ void _drawShader(struct GBAGLES2Shader* shader) {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
} else { } else {
glDisable(GL_BLEND); glDisable(GL_BLEND);
glClear(GL_COLOR_BUFFER_BIT);
} }
glGetIntegerv(GL_VIEWPORT, viewport); glGetIntegerv(GL_VIEWPORT, viewport);
@ -224,7 +225,6 @@ void _drawShader(struct GBAGLES2Shader* shader) {
} }
} }
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
glBindTexture(GL_TEXTURE_2D, shader->tex); glBindTexture(GL_TEXTURE_2D, shader->tex);
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]); glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
} }
@ -241,6 +241,7 @@ void GBAGLES2ContextDrawFrame(struct VideoBackend* v) {
_drawShader(&context->shaders[n]); _drawShader(&context->shaders[n]);
} }
_drawShader(&context->finalShader); _drawShader(&context->finalShader);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
glUseProgram(0); glUseProgram(0);
} }
@ -313,13 +314,19 @@ void GBAGLES2ShaderInit(struct GBAGLES2Shader* shader, const char* vs, const cha
char log[1024]; char log[1024];
glCompileShader(shader->fragmentShader); glCompileShader(shader->fragmentShader);
glGetShaderInfoLog(shader->fragmentShader, 1024, 0, log); glGetShaderInfoLog(shader->fragmentShader, 1024, 0, log);
printf("%s\n", log); if (log[0]) {
printf("%s\n", log);
}
glCompileShader(shader->vertexShader); glCompileShader(shader->vertexShader);
glGetShaderInfoLog(shader->vertexShader, 1024, 0, log); glGetShaderInfoLog(shader->vertexShader, 1024, 0, log);
printf("%s\n", log); if (log[0]) {
printf("%s\n", log);
}
glLinkProgram(shader->program); glLinkProgram(shader->program);
glGetProgramInfoLog(shader->program, 1024, 0, log); glGetProgramInfoLog(shader->program, 1024, 0, log);
printf("%s\n", log); if (log[0]) {
printf("%s\n", log);
}
shader->texLocation = glGetUniformLocation(shader->program, "tex"); shader->texLocation = glGetUniformLocation(shader->program, "tex");
shader->positionLocation = glGetAttribLocation(shader->program, "position"); shader->positionLocation = glGetAttribLocation(shader->program, "position");