From e88d35d1c1ce993bff93001a918b825ce1a6b0d3 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 27 Dec 2011 12:35:35 -0600 Subject: [PATCH] Had a few vec4 and float4(0) calls floating around. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 9f1eb99938..a6e1995ad9 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -888,11 +888,11 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType WriteAlphaTest(p, ApiType, dstAlphaMode); // alpha test will always fail, so restart the shader and just make it an empty function /* p = pmainstart; - WRITE(p, "ocol0 = 0;\n"); + WRITE(p, "ocol0 = float4(0.0f);\n"); if(DepthTextureEnable) WRITE(p, "depth = 1.f;\n"); if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) - WRITE(p, "ocol1 = vec4(0.0f);\n"); + WRITE(p, "ocol1 = float4(0.0f,0.0f,0.0f,0.0f);\n"); if (ApiType == API_GLSL) { // Once we switch to GLSL 1.3 and bind variables, we won't need to do this @@ -1399,7 +1399,6 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode compindex = bpmem.alphaFunc.comp1 % 8; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table -<<<<<<< HEAD WRITE(p, ")) {\n"); WRITE(p, "ocol0 = float4(0.0f);\n"); @@ -1428,7 +1427,6 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode } WRITE(p, "}\n"); - } static const char *tevFogFuncsTable[] =