From 3f0d7312fa10db750c97ace02e881d71cb659053 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 13 Oct 2012 12:43:00 -0500 Subject: [PATCH] A couple missed lines on the rebase. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 7 +++---- Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 6b760ba40f..e7b40c3212 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -978,16 +978,15 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType // Colors will be blended against the alpha from ocol1... WRITE(p, " ocol1 = ocol0;\n"); // ...and the alpha from ocol0 will be written to the framebuffer. - WRITE(p, " ocol0.a = " I_ALPHA"[0].a;\n"); - - if (ApiType == API_GLSL) + WRITE(p, " ocol0.a = " I_ALPHA"[0].a;\n"); + } + if (ApiType == API_GLSL) { if (DepthTextureEnable) WRITE(p, "gl_FragDepth = depth;\n"); if (dstAlphaMode != DSTALPHA_DUAL_SOURCE_BLEND) WRITE(p, "gl_FragData[0] = ocol0;\n"); } - } WRITE(p, "}\n"); if (text[sizeof(text) - 1] != 0x7C) diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 430e929509..d0379e697d 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -596,7 +596,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType) //seems to get rather complicated } - if (api_type & API_D3D9) + if (ApiType & API_D3D9) { // D3D9 is addressing pixel centers instead of pixel boundaries in clip space. // Thus we need to offset the final position by half a pixel