diff options
| author | 2018-11-21 22:06:01 -0300 | |
|---|---|---|
| committer | 2018-11-21 22:31:16 -0300 | |
| commit | 8a5e6fce072227edcf1c8af19c3749d695f483ac (patch) | |
| tree | 945d868936da09d49ba0fb0ba3e7dba2f2e1717c /src/video_core/engines | |
| parent | Merge pull request #1753 from FernandoS27/ufbtype (diff) | |
| download | yuzu-8a5e6fce072227edcf1c8af19c3749d695f483ac.tar.gz yuzu-8a5e6fce072227edcf1c8af19c3749d695f483ac.tar.xz yuzu-8a5e6fce072227edcf1c8af19c3749d695f483ac.zip | |
gl_shader_decompiler: Rename control codes to condition codes
Diffstat (limited to 'src/video_core/engines')
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 83a6fd875..ee1710e8a 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h | |||
| @@ -261,7 +261,7 @@ enum class FlowCondition : u64 { | |||
| 261 | Fcsm_Tr = 0x1C, // TODO(bunnei): What is this used for? | 261 | Fcsm_Tr = 0x1C, // TODO(bunnei): What is this used for? |
| 262 | }; | 262 | }; |
| 263 | 263 | ||
| 264 | enum class ControlCode : u64 { | 264 | enum class ConditionCode : u64 { |
| 265 | F = 0, | 265 | F = 0, |
| 266 | LT = 1, | 266 | LT = 1, |
| 267 | EQ = 2, | 267 | EQ = 2, |
| @@ -569,7 +569,6 @@ union Instruction { | |||
| 569 | BitField<39, 2, u64> tab5cb8_2; | 569 | BitField<39, 2, u64> tab5cb8_2; |
| 570 | BitField<41, 3, u64> tab5c68_1; | 570 | BitField<41, 3, u64> tab5c68_1; |
| 571 | BitField<44, 2, u64> tab5c68_0; | 571 | BitField<44, 2, u64> tab5c68_0; |
| 572 | BitField<47, 1, u64> cc; | ||
| 573 | BitField<48, 1, u64> negate_b; | 572 | BitField<48, 1, u64> negate_b; |
| 574 | } fmul; | 573 | } fmul; |
| 575 | 574 | ||
| @@ -831,7 +830,7 @@ union Instruction { | |||
| 831 | union { | 830 | union { |
| 832 | BitField<0, 3, u64> pred0; | 831 | BitField<0, 3, u64> pred0; |
| 833 | BitField<3, 3, u64> pred3; | 832 | BitField<3, 3, u64> pred3; |
| 834 | BitField<8, 5, ControlCode> cc; // flag in cc | 833 | BitField<8, 5, ConditionCode> cc; // flag in cc |
| 835 | BitField<39, 3, u64> pred39; | 834 | BitField<39, 3, u64> pred39; |
| 836 | BitField<42, 1, u64> neg_pred39; | 835 | BitField<42, 1, u64> neg_pred39; |
| 837 | BitField<45, 4, PredOperation> op; // op with pred39 | 836 | BitField<45, 4, PredOperation> op; // op with pred39 |
| @@ -1235,7 +1234,7 @@ union Instruction { | |||
| 1235 | BitField<60, 1, u64> is_b_gpr; | 1234 | BitField<60, 1, u64> is_b_gpr; |
| 1236 | BitField<59, 1, u64> is_c_gpr; | 1235 | BitField<59, 1, u64> is_c_gpr; |
| 1237 | BitField<20, 24, s64> smem_imm; | 1236 | BitField<20, 24, s64> smem_imm; |
| 1238 | BitField<0, 5, ControlCode> flow_control_code; | 1237 | BitField<0, 5, ConditionCode> flow_condition_code; |
| 1239 | 1238 | ||
| 1240 | Attribute attribute; | 1239 | Attribute attribute; |
| 1241 | Sampler sampler; | 1240 | Sampler sampler; |