ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6741 from stenzek/more-implicit-conversions 

TextureConversionShader: Fix more implicit conversion errors
This commit is contained in:
Stenzek 2018-05-03 14:16:09 +10:00 committed by GitHub
parent ef98a21735 a93830056f
commit ac12d23702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,7 @@ static void WriteSampleFunction(char*& p, const EFBCopyParams& params, APIType A
else
WRITE(p, "Tex0.Sample(samp0, float3(");
WRITE(p, "uv.x + xoffset * pixel_size.x, ");
WRITE(p, "uv.x + float(xoffset) * pixel_size.x, ");
// Reverse the direction for OpenGL, since positive numbers are distance from the bottom row.
if (yoffset != 0)
@ -257,7 +257,8 @@ static void WriteSwizzler(char*& p, const EFBCopyParams& params, EFBCopyFormat f
WRITE(p, " uv0.y = 1.0-uv0.y;\n");
}
WRITE(p, " float2 pixel_size = position.ww / float2(%d, %d);\n", EFB_WIDTH, EFB_HEIGHT);
WRITE(p, " float2 pixel_size = float2(position.w, position.w) / float2(%d, %d);\n", EFB_WIDTH,
EFB_HEIGHT);
}
static void WriteSampleColor(char*& p, const char* colorComp, const char* dest, int xoffset,