summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-06-04 18:58:29 +0200
committerSubv <subv2112@gmail.com>2018-06-04 23:41:28 +0200
commit2933521a08f483d3de80f455326e6f7eb5d3cbae (patch)
tree83c1e9f6a7ec53b01a58be2c6d8137a6b7117646
parentGPU: Corrected the I2F_R implementation. (diff)
downloadyuzu-2933521a08f483d3de80f455326e6f7eb5d3cbae.tar
yuzu-2933521a08f483d3de80f455326e6f7eb5d3cbae.tar.gz
yuzu-2933521a08f483d3de80f455326e6f7eb5d3cbae.tar.bz2
yuzu-2933521a08f483d3de80f455326e6f7eb5d3cbae.tar.lz
yuzu-2933521a08f483d3de80f455326e6f7eb5d3cbae.tar.xz
yuzu-2933521a08f483d3de80f455326e6f7eb5d3cbae.tar.zst
yuzu-2933521a08f483d3de80f455326e6f7eb5d3cbae.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h2
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index da64430e9..77c8399f1 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -245,9 +245,9 @@ union Instruction {
BitField<44, 1, u64> abs_b;
BitField<45, 2, PredOperation> op;
BitField<48, 4, PredCondition> cond;
+ BitField<52, 1, u64> bf;
BitField<53, 1, u64> neg_b;
BitField<54, 1, u64> abs_a;
- BitField<52, 1, u64> bf;
BitField<55, 1, u64> ftz;
BitField<56, 1, u64> neg_imm;
} fset;
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index ffb89e4f4..39cb022fe 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -1066,7 +1066,12 @@ private:
std::string predicate = "(((" + op_a + ") " + comparator + " (" + op_b + ")) " +
combiner + " (" + second_pred + "))";
- regs.SetRegisterToFloat(instr.gpr0, 0, predicate + " ? 1.0 : 0.0", 1, 1);
+ if (instr.fset.bf) {
+ regs.SetRegisterToFloat(instr.gpr0, 0, predicate + " ? 1.0 : 0.0", 1, 1);
+ } else {
+ regs.SetRegisterToInteger(instr.gpr0, false, 0, predicate + " ? 0xFFFFFFFF : 0", 1,
+ 1);
+ }
break;
}
default: {