From d9adc263325ed242a9c363928d76333d5d181afa Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 22 Feb 2013 12:14:39 +0100 Subject: [PATCH] real Star Fox fix --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index b1c2e9abbd..6c54d42a34 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -439,8 +439,8 @@ static const char *tevRasTable[] = "ERROR13", //2 "ERROR14", //3 "ERROR15", //4 - "alphabump", // use bump alpha - "(alphabump*(255.0f/248.0f))", //normalized + "alphabump.xxxx", // use bump alpha + "(alphabump.xxxx*(255.0f/248.0f))", //normalized "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero }; @@ -448,7 +448,7 @@ static const char *tevRasTable[] = static const char *tevCOutputTable[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; static const char *tevAOutputTable[] = { "prev.a", "c0.a", "c1.a", "c2.a" }; -static const char *tevIndAlphaSel[] = {"", "xxxx", "yyyy", "zzzz"}; +static const char *tevIndAlphaSel[] = {"", "x", "y", "z"}; //static const char *tevIndAlphaScale[] = {"", "*32", "*16", "*8"}; static const char *tevIndAlphaScale[] = {"*(248.0f/255.0f)", "*(224.0f/255.0f)", "*(240.0f/255.0f)", "*(248.0f/255.0f)"}; static const char *tevIndBiasField[] = {"", "x", "y", "xy", "z", "xz", "yz", "xyz"}; // indexed by bias @@ -656,7 +656,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType WRITE(p, " float4 c0 = " I_COLORS"[1], c1 = " I_COLORS"[2], c2 = " I_COLORS"[3], prev = float4(0.0f, 0.0f, 0.0f, 0.0f), textemp = float4(0.0f, 0.0f, 0.0f, 0.0f), rastemp = float4(0.0f, 0.0f, 0.0f, 0.0f), konsttemp = float4(0.0f, 0.0f, 0.0f, 0.0f);\n" " float3 comp16 = float3(1.0f, 255.0f, 0.0f), comp24 = float3(1.0f, 255.0f, 255.0f*255.0f);\n" - " float4 alphabump=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float alphabump=0.0f;\n" " float3 tevcoord=float3(0.0f, 0.0f, 0.0f);\n" " float2 wrappedcoord=float2(0.0f,0.0f), tempcoord=float2(0.0f,0.0f);\n" " float4 cc0=float4(0.0f,0.0f,0.0f,0.0f), cc1=float4(0.0f,0.0f,0.0f,0.0f);\n"