From ff25b9d20e1334093135d7fb3078fdaeaaa354f1 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 4 May 2014 08:43:30 -0700 Subject: [PATCH] Oops, the vertexdecoder should read vertex alpha. Copy/paste mistake... ugh. --- GPU/GLES/Framebuffer.cpp | 7 ++++++- GPU/GLES/VertexDecoderArm.cpp | 2 +- GPU/GLES/VertexDecoderX86.cpp | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index fefd6d845e..e4be0de753 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -1525,7 +1525,12 @@ void FramebufferManager::PackFramebufferSync_(VirtualFramebuffer *vfb) { (u32)bufSize, packed, fb_address); glPixelStorei(GL_PACK_ALIGNMENT, 4); - glReadPixels(0, 0, vfb->fb_stride, vfb->height, GL_RGBA, GL_UNSIGNED_BYTE, packed); + GLenum glfmt = GL_RGBA; +#if defined(MAY_HAVE_GLES3) + if (UseBGRA8888()) + glfmt = GL_BGRA_EXT; +#endif + glReadPixels(0, 0, vfb->fb_stride, vfb->height, glfmt, GL_UNSIGNED_BYTE, packed); GLenum error = glGetError(); switch(error) { case 0: diff --git a/GPU/GLES/VertexDecoderArm.cpp b/GPU/GLES/VertexDecoderArm.cpp index 28a45e7279..13fbb28f3d 100644 --- a/GPU/GLES/VertexDecoderArm.cpp +++ b/GPU/GLES/VertexDecoderArm.cpp @@ -290,7 +290,7 @@ JittedVertexDecoder VertexDecoderJitCache::Compile(const VertexDecoder &dec) { B_CC(CC_NEQ, loopStart); if (dec.col) { - MOVP2R(tempReg1, &gstate_c.textureFullAlpha); + MOVP2R(tempReg1, &gstate_c.vertexFullAlpha); CMP(fullAlphaReg, 0); SetCC(CC_EQ); STRB(fullAlphaReg, tempReg1, 0); diff --git a/GPU/GLES/VertexDecoderX86.cpp b/GPU/GLES/VertexDecoderX86.cpp index 3eb00c4f4f..989dab634a 100644 --- a/GPU/GLES/VertexDecoderX86.cpp +++ b/GPU/GLES/VertexDecoderX86.cpp @@ -561,7 +561,7 @@ void VertexDecoderJitCache::Jit_Color8888() { CMP(32, R(tempReg1), Imm32(0xFF000000)); FixupBranch skip = J_CC(CC_GE, false); - MOV(8, M(&gstate_c.textureFullAlpha), Imm8(0)); + MOV(8, M(&gstate_c.vertexFullAlpha), Imm8(0)); SetJumpTarget(skip); } @@ -635,7 +635,7 @@ void VertexDecoderJitCache::Jit_Color4444() { CMP(32, R(tempReg2), Imm32(0xFF000000)); FixupBranch skip = J_CC(CC_AE, false); - MOV(8, M(&gstate_c.textureFullAlpha), Imm8(0)); + MOV(8, M(&gstate_c.vertexFullAlpha), Imm8(0)); SetJumpTarget(skip); } @@ -712,7 +712,7 @@ void VertexDecoderJitCache::Jit_Color5551() { CMP(32, R(tempReg2), Imm32(0xFF000000)); FixupBranch skip = J_CC(CC_AE, false); - MOV(8, M(&gstate_c.textureFullAlpha), Imm8(0)); + MOV(8, M(&gstate_c.vertexFullAlpha), Imm8(0)); SetJumpTarget(skip); } @@ -913,7 +913,7 @@ void VertexDecoderJitCache::Jit_WriteMorphColor(int outOff, bool checkAlpha) { if (checkAlpha) { CMP(32, R(tempReg1), Imm32(0xFF000000)); FixupBranch skip = J_CC(CC_AE, false); - MOV(8, M(&gstate_c.textureFullAlpha), Imm8(0)); + MOV(8, M(&gstate_c.vertexFullAlpha), Imm8(0)); SetJumpTarget(skip); } else { // Force alpha to full if we're not checking it.