Browse Source
Merge pull request #602 from Subv/mufu_subop
GPU: Corrected the size of the MUFU subop field, and removed incorrect "min" operation.
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
6 deletions
-
src/video_core/engines/shader_bytecode.h
-
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
|
|
|
@ -166,7 +166,6 @@ enum class SubOp : u64 { |
|
|
|
Lg2 = 0x3, |
|
|
|
Rcp = 0x4, |
|
|
|
Rsq = 0x5, |
|
|
|
Min = 0x8, |
|
|
|
}; |
|
|
|
|
|
|
|
enum class F2iRoundingOp : u64 { |
|
|
|
@ -210,7 +209,7 @@ union Instruction { |
|
|
|
} pred; |
|
|
|
BitField<19, 1, u64> negate_pred; |
|
|
|
BitField<20, 8, Register> gpr20; |
|
|
|
BitField<20, 7, SubOp> sub_op; |
|
|
|
BitField<20, 4, SubOp> sub_op; |
|
|
|
BitField<28, 8, Register> gpr28; |
|
|
|
BitField<39, 8, Register> gpr39; |
|
|
|
BitField<48, 16, u64> opcode; |
|
|
|
|
|
|
|
@ -917,10 +917,6 @@ private: |
|
|
|
regs.SetRegisterToFloat(instr.gpr0, 0, "inversesqrt(" + op_a + ')', 1, 1, |
|
|
|
instr.alu.saturate_d); |
|
|
|
break; |
|
|
|
case SubOp::Min: |
|
|
|
regs.SetRegisterToFloat(instr.gpr0, 0, "min(" + op_a + "," + op_b + ')', 1, 1, |
|
|
|
instr.alu.saturate_d); |
|
|
|
break; |
|
|
|
default: |
|
|
|
NGLOG_CRITICAL(HW_GPU, "Unhandled MUFU sub op: {0:x}", |
|
|
|
static_cast<unsigned>(instr.sub_op.Value())); |
|
|
|
|
