all repos — mgba @ 89c37820c6a30ec4a9eb9dd3ade851a712d8a607

mGBA Game Boy Advance Emulator

Switch: Fix switching between PBO and FBO games
Vicki Pfau vi@endrift.com
Mon, 27 May 2019 00:06:10 -0700
commit

89c37820c6a30ec4a9eb9dd3ade851a712d8a607

parent

d025dd57041479d54dfec5238573a1cda877b866

1 files changed, 3 insertions(+), 1 deletions(-)

jump to
M src/platform/switch/main.c → src/platform/switch/main.c 
@@ -252,6 +252,9 @@ if (mCoreConfigGetIntValue(&runner->config, "hwaccelVideo", &fakeBool) && fakeBool && runner->core->supportsFeature(runner->core, mCORE_FEATURE_OPENGL)) {
 		runner->core->setVideoGLTex(runner->core, tex);
 		usePbo = false;
 	} else {
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(GL_TEXTURE_2D, tex);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 		runner->core->setVideoBuffer(runner->core, frameBuffer, 256);
 		usePbo = true;
 	}

@@ -557,7 +560,6 @@ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
 	glGenBuffers(1, &pbo);
 	glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo);