From 0f5998d3584b4785c0981c77a9bb51c5396d9372 Mon Sep 17 00:00:00 2001 From: Rodolfo Osvaldo Bogado Date: Tue, 6 Jul 2010 17:21:24 +0000 Subject: [PATCH] little fix for error introduced in shader generator in R5842 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5844 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index dac6e2a8a5..4fb871daf5 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -459,21 +459,21 @@ const char *GeneratePixelShaderCode(u32 texture_mask, bool dstAlphaEnable, API_T WRITE(p, " out float4 ocol0 : SV_Target,\n out float depth : SV_Depth,\n in float4 rawpos : SV_Position,\n"); WRITE(p, " in float4 colors_0 : COLOR0,\n"); - WRITE(p, " in float4 colors_1 : COLOR1\n"); + WRITE(p, " in float4 colors_1 : COLOR1"); // compute window position if needed because binding semantic WPOS is not widely supported if (numTexgen < 7) { for (int i = 0; i < numTexgen; ++i) - WRITE(p, ", \n in float3 uv%d : TEXCOORD%d", i, i); + WRITE(p, ",\n in float3 uv%d : TEXCOORD%d", i, i); - WRITE(p, ", \n in float4 clipPos : TEXCOORD%d", numTexgen); + WRITE(p, ",\n in float4 clipPos : TEXCOORD%d", numTexgen); } else { // wpos is in w of first 4 texcoords for (int i = 0; i < numTexgen; ++i) - WRITE(p, ", \n in float%d uv%d : TEXCOORD%d", i<4?4:3, i, i); + WRITE(p, ",\n in float%d uv%d : TEXCOORD%d", i<4?4:3, i, i); } WRITE(p, " ) {\n"); @@ -597,7 +597,7 @@ const char *GeneratePixelShaderCode(u32 texture_mask, bool dstAlphaEnable, API_T WRITE(p, " ocol0 = prev;\n"); } } - + WRITE(p, "}\n"); if (text[sizeof(text) - 1] != 0x7C) PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");