ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShaderGen: Remove some TODOs and fix an issue with per pixel lighting.

This commit is contained in:
NeoBrainX 2013-03-31 23:57:39 +02:00
parent f57b902d33
commit a60e1a3db8
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,9 +269,6 @@ const char *WriteLocation(API_TYPE ApiType)
template<class T> template<class T>
void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components) void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
{ {
// TODO: Where does this TODO belong again...?
// TODO: Can be optimized if using alpha pass
// Non-uid template parameters will write to the dummy data (=> gets optimized out) // Non-uid template parameters will write to the dummy data (=> gets optimized out)
pixel_shader_uid_data dummy_data; pixel_shader_uid_data dummy_data;
pixel_shader_uid_data& uid_data = (&out.template GetUidData<pixel_shader_uid_data>() != NULL) pixel_shader_uid_data& uid_data = (&out.template GetUidData<pixel_shader_uid_data>() != NULL)
@ -292,9 +289,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
out.Write("//%i TEV stages, %i texgens, XXX IND stages\n", out.Write("//%i TEV stages, %i texgens, XXX IND stages\n",
numStages, numTexgen/*, bpmem.genMode.numindstages*/); numStages, numTexgen/*, bpmem.genMode.numindstages*/);
// uid_data.components = components; // TODO: Enable once per pixel lighting is implemented again
uid_data.dstAlphaMode = dstAlphaMode; uid_data.dstAlphaMode = dstAlphaMode;
uid_data.genMode.numindstages = bpmem.genMode.numindstages; uid_data.genMode.numindstages = bpmem.genMode.numindstages;
uid_data.genMode.numtevstages = bpmem.genMode.numtevstages; uid_data.genMode.numtevstages = bpmem.genMode.numtevstages;
uid_data.genMode.numtexgens = bpmem.genMode.numtexgens; uid_data.genMode.numtexgens = bpmem.genMode.numtexgens;
@ -482,6 +477,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
out.SetConstantsUsed(C_PLIGHTS, C_PLIGHTS+39); // TODO: Can be optimized further out.SetConstantsUsed(C_PLIGHTS, C_PLIGHTS+39); // TODO: Can be optimized further
out.SetConstantsUsed(C_PMATERIALS, C_PMATERIALS+3); out.SetConstantsUsed(C_PMATERIALS, C_PMATERIALS+3);
uid_data.components = components;
GenerateLightingShader<T>(out, uid_data.lighting, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_"); GenerateLightingShader<T>(out, uid_data.lighting, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
} }

1
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
View File

@ -46,7 +46,6 @@ static void DefineVSOutputStructMember(T& object, API_TYPE api_type, const char*
} }
} }
// TODO: Check if something goes wrong if the cached shaders used pixel lighting but it's disabled later??
template<class T> template<class T>
static void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type) static void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
{ {