piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

UberShaderVertex: Simplify color channel logic

Browse Source
This commit is contained in:
Pokechu22 2021-08-09 14:17:26 -07:00
parent 06579e4d53
commit c3dec34391
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Source/Core/VideoCommon/UberShaderVertex.cpp
View File

@ -214,20 +214,36 @@ ShaderCode GenVertexShader(APIType api_type, const ShaderHostConfig& host_config
if (num_texgen > 0)
GenVertexShaderTexGens(api_type, num_texgen, out);
out.Write("// The number of colors available to TEV is determined by numColorChans.\n"
"// We have to provide the fields to match the interface, so set to zero\n"
"// if it's not enabled.\n");
const char* color_prefix;
if (per_pixel_lighting)
{
out.Write("\n// Since per-pixel lighting is enabled, the vertex colors are passed through\n"
"// unmodified so we can evaluate the lighting in the pixel shader.\n");
color_prefix = "vertex_color_";
}
else
{
color_prefix = "rawcolor";
}
out.Write("if (xfmem_numColorChans == 0u) {{\n"
" if ((components & {}u) != 0u)\n"
" o.colors_0 = rawcolor0;\n"
" if ((components & {}u) != 0u) // VB_HAS_COL0\n"
" o.colors_0 = {}0;\n"
" else\n"
" o.colors_0 = float4(1.0, 1.0, 1.0, 1.0);\n"
"}}\n",
VB_HAS_COL0);
out.Write("if (xfmem_numColorChans < 2u) {{\n"
" if ((components & {}u) != 0u)\n"
" o.colors_1 = rawcolor1;\n"
VB_HAS_COL0, color_prefix);
out.Write("if (xfmem_numColorChans <= 1u) {{\n"
" if ((components & {}u) != 0u) // VB_HAS_COL1\n"
" o.colors_1 = {}1;\n"
" else\n"
" o.colors_1 = o.colors_0;\n"
"}}\n",
VB_HAS_COL1);
VB_HAS_COL1, color_prefix);
if (!host_config.fast_depth_calc)
{
@ -238,26 +254,7 @@ ShaderCode GenVertexShader(APIType api_type, const ShaderHostConfig& host_config
if (per_pixel_lighting)
{
out.Write("o.Normal = _norm0;\n"
"o.WorldPos = pos.xyz;\n"
"// Pass through the vertex colors unmodified so we can evaluate the lighting\n"
"// in the same manner.\n");
out.Write("if ((components & {}u) != 0u) // VB_HAS_COL0\n"
" o.colors_0 = vertex_color_0;\n",
VB_HAS_COL0);
out.Write("if ((components & {}u) != 0u) // VB_HAS_COL1\n"
" o.colors_1 = vertex_color_1;\n",
VB_HAS_COL1);
}
else
{
out.Write("// The number of colors available to TEV is determined by numColorChans.\n"
"// We have to provide the fields to match the interface, so set to zero\n"
"// if it's not enabled.\n"
"if (xfmem_numColorChans == 0u)\n"
" o.colors_0 = float4(0.0, 0.0, 0.0, 0.0);\n"
"if (xfmem_numColorChans <= 1u)\n"
" o.colors_1 = float4(0.0, 0.0, 0.0, 0.0);\n"
"\n");
"o.WorldPos = pos.xyz;\n");
}
// If we can disable the incorrect depth clipping planes using depth clamping, then we can do