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

PixelShaderGen: Change the "alpha" uniform to use integers.

This commit is contained in:
Tony Wasserka 2013-10-10 20:36:55 +02:00
parent ec60acac3a
commit c13a5c38e9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/ConstantManager.h
View File

@ -13,7 +13,7 @@ struct PixelShaderConstants
{ {
int4 colors[4]; int4 colors[4];
int4 kcolors[4]; int4 kcolors[4];
float4 alpha; int4 alpha;
float4 texdims[8]; float4 texdims[8];
float4 zbias[2]; float4 zbias[2];
float4 indtexscale[2]; float4 indtexscale[2];

10
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -285,7 +285,7 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T
DeclareUniform(out, ApiType, C_COLORS, "int4", I_COLORS"[4]"); DeclareUniform(out, ApiType, C_COLORS, "int4", I_COLORS"[4]");
DeclareUniform(out, ApiType, C_KCOLORS, "int4", I_KCOLORS"[4]"); DeclareUniform(out, ApiType, C_KCOLORS, "int4", I_KCOLORS"[4]");
DeclareUniform(out, ApiType, C_ALPHA, "float4", I_ALPHA"[1]"); // TODO: Why is this an array...-.- DeclareUniform(out, ApiType, C_ALPHA, "int4", I_ALPHA"[1]"); // TODO: Why is this an array...-.-
DeclareUniform(out, ApiType, C_TEXDIMS, "float4", I_TEXDIMS"[8]"); DeclareUniform(out, ApiType, C_TEXDIMS, "float4", I_TEXDIMS"[8]");
DeclareUniform(out, ApiType, C_ZBIAS, "float4", I_ZBIAS"[2]"); DeclareUniform(out, ApiType, C_ZBIAS, "float4", I_ZBIAS"[2]");
DeclareUniform(out, ApiType, C_INDTEXSCALE, "float4", I_INDTEXSCALE"[2]"); DeclareUniform(out, ApiType, C_INDTEXSCALE, "float4", I_INDTEXSCALE"[2]");
@ -570,7 +570,7 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T
if (dstAlphaMode == DSTALPHA_ALPHA_PASS) if (dstAlphaMode == DSTALPHA_ALPHA_PASS)
{ {
out.SetConstantsUsed(C_ALPHA, C_ALPHA); out.SetConstantsUsed(C_ALPHA, C_ALPHA);
out.Write("\tocol0 = float4(float3(iprev.rgb) / 255.0, " I_ALPHA"[0].a);\n"); out.Write("\tocol0 = float4(float3(iprev.rgb), float(" I_ALPHA".a)) / 255.0;\n");
} }
else else
{ {
@ -586,7 +586,7 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T
// Colors will be blended against the alpha from ocol1 and // Colors will be blended against the alpha from ocol1 and
// the alpha from ocol0 will be written to the framebuffer. // the alpha from ocol0 will be written to the framebuffer.
out.Write("\tocol1 = float4(iprev) / 255.0;\n"); out.Write("\tocol1 = float4(iprev) / 255.0;\n");
out.Write("\tocol0.a = " I_ALPHA"[0].a;\n"); out.Write("\tocol0.a = float(" I_ALPHA".a) / 255.0;\n");
} }
out.Write("}\n"); out.Write("}\n");
@ -962,8 +962,8 @@ static inline void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_T
{ {
static const char *alphaRef[2] = static const char *alphaRef[2] =
{ {
"int(round(" I_ALPHA"[0].r * 255.0))", I_ALPHA".r",
"int(round(" I_ALPHA"[0].g * 255.0))" I_ALPHA".g"
}; };
out.SetConstantsUsed(C_ALPHA, C_ALPHA); out.SetConstantsUsed(C_ALPHA, C_ALPHA);

6
Source/Core/VideoCommon/PixelShaderManager.cpp
View File

@ -164,14 +164,14 @@ void PixelShaderManager::SetColorChanged(int type, int num)
void PixelShaderManager::SetAlpha() void PixelShaderManager::SetAlpha()
{ {
constants.alpha[0] = bpmem.alpha_test.ref0 / 255.0f; constants.alpha[0] = bpmem.alpha_test.ref0;
constants.alpha[1] = bpmem.alpha_test.ref1 / 255.0f; constants.alpha[1] = bpmem.alpha_test.ref1;
dirty = true; dirty = true;
} }
void PixelShaderManager::SetDestAlpha() void PixelShaderManager::SetDestAlpha()
{ {
constants.alpha[3] = bpmem.dstalpha.alpha / 255.0f; constants.alpha[3] = bpmem.dstalpha.alpha;
dirty = true; dirty = true;
} }