piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 13:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some mistakes from the master merge; some cleanups.

Browse Source
This commit is contained in:
NeoBrainX
2013-04-29 19:37:32 +02:00
parent 5e6b712651
commit adab4e37f7
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
View File

@ -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;