dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-08 00:03:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenGL: fix scaled efb2ram copys

Browse Source 
This fix a regression in revision 687097d4bc because of the wrong order of moving the sampled rect and scaling.
This commit is contained in:
degasus 2014-01-05 18:19:17 +01:00
parent 6319b1867b
commit e6676b4565
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/VideoCommon/TextureConversionShader.cpp
View File

@ -110,13 +110,13 @@ void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType)
void WriteSampleColor(char*& p, const char* colorComp, const char* dest, int xoffset, API_TYPE ApiType)
{
WRITE(p, // sampleUv is the sample position in (int)gx_coords
"uv0 = float2(sampleUv + int2(%d, 0)" // pixel offset (if more than one pixel is samped)
" + position.xy);\n" // move to copyed rect
"uv0 += float2(0.5, 0.5);\n" // move to center of pixel
"uv0 *= float(position.w);\n" // scale by two if needed (this will move to pixels border to filter linear)
"uv0 /= float2(%d, %d);\n" // normlize to [0:1]
"uv0.y = 1.0-uv0.y;\n" // ogl foo (disable this line for d3d)
WRITE(p, // sampleUv is the sample position in (int)gx_coords
"uv0 = float2(sampleUv + int2(%d, 0));\n" // pixel offset (if more than one pixel is samped)
"uv0 += float2(0.5, 0.5);\n" // move to center of pixel
"uv0 *= float(position.w);\n" // scale by two if needed (this will move to pixels border to filter linear)
"uv0 += float2(position.xy);\n" // move to copyed rect
"uv0 /= float2(%d, %d);\n" // normlize to [0:1]
"uv0.y = 1.0-uv0.y;\n" // ogl foo (disable this line for d3d)
"%s = texture(samp0, uv0).%s;\n",
xoffset, EFB_WIDTH, EFB_HEIGHT, dest, colorComp
);