diff options
| author | NeoBrainX <NeoBrainX@gmail.com> | 2013-04-29 19:37:32 +0200 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@gmail.com> | 2013-04-29 19:37:32 +0200 |
| commit | adab4e37f7dcfe9a60819a2ed1f8576b8a57a505 (patch) | |
| tree | 4d0e68adf365fdade4da36b6c1e0c6df449aa012 /Source/Core/VideoCommon/Src/PixelShaderGen.cpp | |
| parent | 5e6b712651dc042b06ce59bcfb4becda5ee15022 (diff) | |
Fix some mistakes from the master merge; some cleanups.
Diffstat (limited to 'Source/Core/VideoCommon/Src/PixelShaderGen.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 4187c44d0f..1bf4ca25d8 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -254,7 +254,7 @@ const char *WriteLocation(API_TYPE ApiType) } template<class T> -void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components) +static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components) { // Non-uid template parameters will write to the dummy data (=> gets optimized out) pixel_shader_uid_data dummy_data; @@ -333,9 +333,9 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u if (ApiType == API_OPENGL) { - out.Write("COLOROUT(ocol0);\n"); + out.Write("COLOROUT(ocol0)\n"); if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) - out.Write("COLOROUT(ocol1);\n"); + out.Write("COLOROUT(ocol1)\n"); if (per_pixel_depth) out.Write("#define depth gl_FragDepth\n"); @@ -572,7 +572,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u if (Pretest == AlphaTest::UNDETERMINED) WriteAlphaTest<T>(out, uid_data, ApiType, dstAlphaMode, per_pixel_depth); - + // the screen space depth value = far z + (clip z / clip w) * z range if(ApiType == API_OPENGL || ApiType == API_D3D11) out.Write("float zCoord = rawpos.z;\n"); @@ -584,7 +584,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u } // Note: depth textures are disabled if early depth test is enabled - uid_data.ztex.op = bpmem.ztex2.op; + uid_data.ztex_op = bpmem.ztex2.op; uid_data.per_pixel_depth = per_pixel_depth; uid_data.fog.fsel = bpmem.fog.c_proj_fsel.fsel; |