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

PixelShaderGen: Optimize shader uid data order.

This commit is contained in:
NeoBrainX 2013-08-12 18:21:35 +02:00
parent 7a1940020d
commit 69a5a79c03
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,7 +331,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
out.Write("VARYIN float4 colors_02;\n"); out.Write("VARYIN float4 colors_02;\n");
out.Write("VARYIN float4 colors_12;\n"); out.Write("VARYIN float4 colors_12;\n");
// compute window position if needed because binding semantic WPOS is not widely supported // compute window position if needed because binding semantic WPOS is not widely supported
// Let's set up attributes // Let's set up attributes
if (xfregs.numTexGen.numTexGens < 7) if (xfregs.numTexGen.numTexGens < 7)
@ -500,7 +500,6 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
{ {
uid_data.xfregs_numTexGen_numTexGens = xfregs.numTexGen.numTexGens;
if (xfregs.numTexGen.numTexGens < 7) if (xfregs.numTexGen.numTexGens < 7)
{ {
out.Write("\tfloat3 _norm0 = normalize(Normal.xyz);\n\n"); out.Write("\tfloat3 _norm0 = normalize(Normal.xyz);\n\n");

40
Source/Core/VideoCommon/Src/PixelShaderGen.h
View File

@ -63,18 +63,30 @@ struct pixel_shader_uid_data
u32 num_values; // TODO: Shouldn't be a u32 u32 num_values; // TODO: Shouldn't be a u32
u32 NumValues() const { return num_values; } u32 NumValues() const { return num_values; }
u32 components; u32 components : 23;
u32 dstAlphaMode : 2; u32 dstAlphaMode : 2;
u32 Pretest : 2; u32 Pretest : 2;
u32 nIndirectStagesUsed : 4;
u32 pad0 : 1;
u32 genMode_numtexgens : 4; u32 genMode_numtexgens : 4;
u32 genMode_numtevstages : 4; u32 genMode_numtevstages : 4;
u32 genMode_numindstages : 3; u32 genMode_numindstages : 3;
u32 alpha_test_comp0 : 3;
u32 nIndirectStagesUsed : 8; u32 alpha_test_comp1 : 3;
u32 alpha_test_logic : 2;
u32 alpha_test_use_zcomploc_hack : 1;
u32 fog_proj : 1;
u32 fog_fsel : 3;
u32 fog_RangeBaseEnabled : 1;
u32 ztex_op : 2;
u32 fast_depth_calc : 1;
u32 per_pixel_depth : 1;
u32 forced_early_z : 1;
u32 early_ztest : 1;
u32 pad1 : 1;
u32 texMtxInfo_n_projection : 8; // 8x1 bit u32 texMtxInfo_n_projection : 8; // 8x1 bit
u32 tevindref_bi0 : 3; u32 tevindref_bi0 : 3;
u32 tevindref_bc0 : 3; u32 tevindref_bc0 : 3;
u32 tevindref_bi1 : 3; u32 tevindref_bi1 : 3;
@ -83,6 +95,7 @@ struct pixel_shader_uid_data
u32 tevindref_bc3 : 3; u32 tevindref_bc3 : 3;
u32 tevindref_bi4 : 3; u32 tevindref_bi4 : 3;
u32 tevindref_bc4 : 3; u32 tevindref_bc4 : 3;
inline void SetTevindrefValues(int index, u32 texcoord, u32 texmap) inline void SetTevindrefValues(int index, u32 texcoord, u32 texmap)
{ {
if (index == 0) { tevindref_bc0 = texcoord; tevindref_bi0 = texmap; } if (index == 0) { tevindref_bc0 = texcoord; tevindref_bi0 = texmap; }
@ -98,25 +111,6 @@ struct pixel_shader_uid_data
else if (index == 3) { tevindref_bi4 = texmap; } else if (index == 3) { tevindref_bi4 = texmap; }
} }
u32 alpha_test_comp0 : 3;
u32 alpha_test_comp1 : 3;
u32 alpha_test_logic : 2;
u32 alpha_test_use_zcomploc_hack : 1;
u32 fog_proj : 1;
u32 fog_fsel : 3;
u32 fog_RangeBaseEnabled : 1;
u32 ztex_op : 2;
u32 fast_depth_calc : 1;
u32 per_pixel_depth : 1;
u32 forced_early_z : 1;
u32 early_ztest : 1;
u32 xfregs_numTexGen_numTexGens : 4;
struct { struct {
// TODO: Can save a lot space by removing the padding bits // TODO: Can save a lot space by removing the padding bits
u32 cc : 24; u32 cc : 24;