Merge pull request #9497 from Pokechu22/better-fifo-analyzer

Graphics refactoring + add names and descriptions in FIFO analyzer

1 files changed, 25 insertions, 16 deletions

diff --git a/Source/Core/VideoCommon/PixelShaderGen.h b/Source/Core/VideoCommon/PixelShaderGen.h
index 08704bda0a..a9ffa25498 100644
--- a/Source/Core/VideoCommon/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/PixelShaderGen.h
@@ -9,6 +9,15 @@
 #include "VideoCommon/ShaderGenCommon.h"
 
 enum class APIType;
+enum class AlphaTestResult;
+enum class SrcBlendFactor : u32;
+enum class DstBlendFactor : u32;
+enum class CompareMode : u32;
+enum class AlphaTestOp : u32;
+enum class RasColorChan : u32;
+enum class KonstSel : u32;
+enum class FogProjection : u32;
+enum class FogType : u32;
 
 #pragma pack(1)
 struct pixel_shader_uid_data
@@ -19,18 +28,18 @@ struct pixel_shader_uid_data
   u32 NumValues() const { return num_values; }
   u32 pad0 : 4;
   u32 useDstAlpha : 1;
-  u32 Pretest : 2;
+  AlphaTestResult Pretest : 2;
   u32 nIndirectStagesUsed : 4;
   u32 genMode_numtexgens : 4;
   u32 genMode_numtevstages : 4;
   u32 genMode_numindstages : 3;
-  u32 alpha_test_comp0 : 3;
-  u32 alpha_test_comp1 : 3;
-  u32 alpha_test_logic : 2;
+  CompareMode alpha_test_comp0 : 3;
+  CompareMode alpha_test_comp1 : 3;
+  AlphaTestOp alpha_test_logic : 2;
   u32 alpha_test_use_zcomploc_hack : 1;
-  u32 fog_proj : 1;
+  FogProjection fog_proj : 1;
 
-  u32 fog_fsel : 3;
+  FogType fog_fsel : 3;
   u32 fog_RangeBaseEnabled : 1;
   u32 ztex_op : 2;
   u32 per_pixel_depth : 1;
@@ -43,13 +52,13 @@ struct pixel_shader_uid_data
   u32 rgba6_format : 1;
   u32 dither : 1;
   u32 uint_output : 1;
-  u32 blend_enable : 1;            // Only used with shader_framebuffer_fetch blend
-  u32 blend_src_factor : 3;        // Only used with shader_framebuffer_fetch blend
-  u32 blend_src_factor_alpha : 3;  // Only used with shader_framebuffer_fetch blend
-  u32 blend_dst_factor : 3;        // Only used with shader_framebuffer_fetch blend
-  u32 blend_dst_factor_alpha : 3;  // Only used with shader_framebuffer_fetch blend
-  u32 blend_subtract : 1;          // Only used with shader_framebuffer_fetch blend
-  u32 blend_subtract_alpha : 1;    // Only used with shader_framebuffer_fetch blend
+  u32 blend_enable : 1;                       // Only used with shader_framebuffer_fetch blend
+  SrcBlendFactor blend_src_factor : 3;        // Only used with shader_framebuffer_fetch blend
+  SrcBlendFactor blend_src_factor_alpha : 3;  // Only used with shader_framebuffer_fetch blend
+  DstBlendFactor blend_dst_factor : 3;        // Only used with shader_framebuffer_fetch blend
+  DstBlendFactor blend_dst_factor_alpha : 3;  // Only used with shader_framebuffer_fetch blend
+  u32 blend_subtract : 1;                     // Only used with shader_framebuffer_fetch blend
+  u32 blend_subtract_alpha : 1;               // Only used with shader_framebuffer_fetch blend
 
   u32 texMtxInfo_n_projection : 8;  // 8x1 bit
   u32 tevindref_bi0 : 3;
@@ -136,7 +145,7 @@ struct pixel_shader_uid_data
     u32 tevorders_texmap : 3;
     u32 tevorders_texcoord : 3;
     u32 tevorders_enable : 1;
-    u32 tevorders_colorchan : 3;
+    RasColorChan tevorders_colorchan : 3;
     u32 pad1 : 6;
 
     // TODO: Clean up the swapXY mess
@@ -152,8 +161,8 @@ struct pixel_shader_uid_data
     u32 tevksel_swap2c : 2;
     u32 tevksel_swap1d : 2;
     u32 tevksel_swap2d : 2;
-    u32 tevksel_kc : 5;
-    u32 tevksel_ka : 5;
+    KonstSel tevksel_kc : 5;
+    KonstSel tevksel_ka : 5;
     u32 pad3 : 14;
   } stagehash[16];