all repos — mgba @ b851cc332e6e1491c176107cf3a6b322b86cb7fe

mGBA Game Boy Advance Emulator

OpenGL: Only resize textures when needed
Vicki Pfau vi@endrift.com
Sat, 21 Sep 2019 16:06:01 -0700
commit

b851cc332e6e1491c176107cf3a6b322b86cb7fe

parent

ed2703ab66d60b5597983fb7133f5e36ec2cae0c

3 files changed, 33 insertions(+), 10 deletions(-)

jump to
M CHANGESCHANGES

@@ -70,6 +70,7 @@ - Switch: Support file associations

- Qt: Scale pixel color values to full range (fixes mgba.io/i/1511) - Qt, OpenGL: Disable integer scaling for dimensions that don't fit - Feature: Switch from ImageMagick to FFmpeg for GIF generation + - OpenGL: Only resize textures when needed 0.7.3: (2019-09-15) Emulation fixes:
M src/platform/opengl/gles2.csrc/platform/opengl/gles2.c

@@ -178,6 +178,15 @@ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0);

#else glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); #endif + + size_t n; + for (n = 0; n < context->nShaders; ++n) { + if (context->shaders[n].width < 0 || context->shaders[n].height < 0) { + context->shaders[n].dirty = true; + } + } + context->initialShader.dirty = true; + context->interframeShader.dirty = true; } static void mGLES2ContextDeinit(struct VideoBackend* v) {

@@ -191,6 +200,7 @@ free(context->initialShader.uniforms);

} static void mGLES2ContextResized(struct VideoBackend* v, unsigned w, unsigned h) { + struct mGLES2Context* context = (struct mGLES2Context*) v; unsigned drawW = w; unsigned drawH = h; if (v->lockAspectRatio) {

@@ -208,6 +218,12 @@ if (drawH >= v->height) {

drawH -= drawH % v->height; } } + size_t n; + for (n = 0; n < context->nShaders; ++n) { + if (context->shaders[n].width == 0 || context->shaders[n].height == 0) { + context->shaders[n].dirty = true; + } + } glBindFramebuffer(GL_FRAMEBUFFER, 0); glViewport((w - drawW) / 2, (h - drawH) / 2, drawW, drawH); }

@@ -221,8 +237,6 @@ }

void _drawShader(struct mGLES2Context* context, struct mGLES2Shader* shader) { GLint viewport[4]; - glBindFramebuffer(GL_FRAMEBUFFER, shader->fbo); - glGetIntegerv(GL_VIEWPORT, viewport); int drawW = shader->width; int drawH = shader->height;

@@ -246,6 +260,19 @@ padH = 0;

drawW -= drawW % context->d.width; drawH -= drawH % context->d.height; } + + if (shader->dirty) { + if (shader->tex && (shader->width <= 0 || shader->height <= 0)) { + GLint oldTex; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldTex); + glBindTexture(GL_TEXTURE_2D, shader->tex); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, drawW, drawH, 0, GL_RGB, GL_UNSIGNED_BYTE, 0); + glBindTexture(GL_TEXTURE_2D, oldTex); + } + shader->dirty = false; + } + + glBindFramebuffer(GL_FRAMEBUFFER, shader->fbo); glViewport(padW, padH, drawW, drawH); if (shader->blend) { glEnable(GL_BLEND);

@@ -256,14 +283,6 @@ glClearColor(0.f, 0.f, 0.f, 1.f);

glClear(GL_COLOR_BUFFER_BIT); } - if (shader->tex && (shader->width <= 0 || shader->height <= 0)) { - GLint oldTex; - glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldTex); - glBindTexture(GL_TEXTURE_2D, shader->tex); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, drawW, drawH, 0, GL_RGB, GL_UNSIGNED_BYTE, 0); - glBindTexture(GL_TEXTURE_2D, oldTex); - } - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, shader->filter ? GL_LINEAR : GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, shader->filter ? GL_LINEAR : GL_NEAREST); glUseProgram(shader->program);

@@ -340,6 +359,7 @@ GLint viewport[4];

glGetIntegerv(GL_VIEWPORT, viewport); context->finalShader.filter = v->filter; + context->finalShader.dirty = true; _drawShader(context, &context->initialShader); if (v->interframeBlending) { context->interframeShader.blend = true;

@@ -404,6 +424,7 @@ shader->height = height;

shader->integerScaling = integerScaling; shader->filter = false; shader->blend = false; + shader->dirty = true; shader->uniforms = uniforms; shader->nUniforms = nUniforms; glGenFramebuffers(1, &shader->fbo);
M src/platform/opengl/gles2.hsrc/platform/opengl/gles2.h

@@ -60,6 +60,7 @@ int height;

bool integerScaling; bool filter; bool blend; + bool dirty; GLuint tex; GLuint fbo; GLuint vao;