diff options
| author | Markus Wick <markus@selfnet.de> | 2015-08-13 08:29:42 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2015-08-13 08:29:42 +0200 |
| commit | 4c5fec477272b24416cc6f9d5a3ac86d589a34b4 (patch) | |
| tree | 7602d4ffe702a77c8674ca4b4a5e8476ff626745 /Source/Core/VideoBackends/OGL/TextureConverter.cpp | |
| parent | 40818c4aad31db55d4704c5f0703b6f91db975f8 (diff) | |
| parent | c80e3089c8465bdf48f178639ae6ee1928d3dc23 (diff) | |
Merge pull request #2838 from Sonicadvance1/fix_gles_xfb
[GLES] Fix real XFB.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureConverter.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureConverter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index 53b615a5aa..c85b617294 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -121,7 +121,7 @@ static void CreatePrograms() // We switch top/bottom here. TODO: move this to screen blit. " ivec2 ts = textureSize(samp9, 0);\n" " vec4 c0 = texelFetch(samp9, ivec2(uv.x>>1, ts.y-uv.y-1), 0);\n" - " float y = mix(c0.b, c0.r, (uv.x & 1) == 1);\n" + " float y = mix(c0.r, c0.b, (uv.x & 1) == 1);\n" " float yComp = 1.164 * (y - 0.0625);\n" " float uComp = c0.g - 0.5;\n" " float vComp = c0.a - 0.5;\n" @@ -365,7 +365,7 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur // set srcAddr as data for source texture glActiveTexture(GL_TEXTURE9); glBindTexture(GL_TEXTURE_2D, s_srcTexture); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, srcWidth / 2, srcHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, srcAddr); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, srcWidth / 2, srcHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, srcAddr); g_sampler_cache->BindNearestSampler(9); glViewport(0, 0, srcWidth, srcHeight); |