artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #602 from Subv/mufu_subop

Browse source 
GPU: Corrected the size of the MUFU subop field, and removed incorrect "min" operation.
This commit is contained in:
bunnei 2018-07-01 11:06:04 -04:00 committed by GitHub
parent b611d852db f33e406ff2
commit 066d6184d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/video_core/engines/shader_bytecode.h
View file

@ -166,7 +166,6 @@ enum class SubOp : u64 {
Lg2 = 0x3, Lg2 = 0x3,
Rcp = 0x4, Rcp = 0x4,
Rsq = 0x5, Rsq = 0x5,
Min = 0x8,
}; };
enum class F2iRoundingOp : u64 { enum class F2iRoundingOp : u64 {
@ -210,7 +209,7 @@ union Instruction {
} pred; } pred;
BitField<19, 1, u64> negate_pred; BitField<19, 1, u64> negate_pred;
BitField<20, 8, Register> gpr20; BitField<20, 8, Register> gpr20;
BitField<20, 7, SubOp> sub_op; BitField<20, 4, SubOp> sub_op;
BitField<28, 8, Register> gpr28; BitField<28, 8, Register> gpr28;
BitField<39, 8, Register> gpr39; BitField<39, 8, Register> gpr39;
BitField<48, 16, u64> opcode; BitField<48, 16, u64> opcode;

4
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View file

@ -917,10 +917,6 @@ private:
regs.SetRegisterToFloat(instr.gpr0, 0, "inversesqrt(" + op_a + ')', 1, 1, regs.SetRegisterToFloat(instr.gpr0, 0, "inversesqrt(" + op_a + ')', 1, 1,
instr.alu.saturate_d); instr.alu.saturate_d);
break; break;
case SubOp::Min:
regs.SetRegisterToFloat(instr.gpr0, 0, "min(" + op_a + "," + op_b + ')', 1, 1,
instr.alu.saturate_d);
break;
default: default:
NGLOG_CRITICAL(HW_GPU, "Unhandled MUFU sub op: {0:x}", NGLOG_CRITICAL(HW_GPU, "Unhandled MUFU sub op: {0:x}",
static_cast<unsigned>(instr.sub_op.Value())); static_cast<unsigned>(instr.sub_op.Value()));