ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix using incorrect result types for compares

This commit is contained in:
Dr. Chat 2016-02-20 21:55:32 -06:00
parent ca01bb2311
commit 2629ae4a14
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/gpu/spirv_shader_translator.cc
View File

@ -566,7 +566,7 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
case AluVectorOpcode::kSge: { case AluVectorOpcode::kSge: {
// foreach(el) src0 >= src1 ? 1.0 : 0.0 // foreach(el) src0 >= src1 ? 1.0 : 0.0
auto c = b.createBinOp(spv::Op::OpFOrdGreaterThanEqual, vec4_float_type_, auto c = b.createBinOp(spv::Op::OpFOrdGreaterThanEqual, vec4_bool_type_,
sources[0], sources[1]); sources[0], sources[1]);
dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c, dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c,
vec4_float_one_, vec4_float_zero_); vec4_float_one_, vec4_float_zero_);
@ -574,7 +574,7 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
case AluVectorOpcode::kSgt: { case AluVectorOpcode::kSgt: {
// foreach(el) src0 > src1 ? 1.0 : 0.0 // foreach(el) src0 > src1 ? 1.0 : 0.0
auto c = b.createBinOp(spv::Op::OpFOrdGreaterThan, vec4_float_type_, auto c = b.createBinOp(spv::Op::OpFOrdGreaterThan, vec4_bool_type_,
sources[0], sources[1]); sources[0], sources[1]);
dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c, dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c,
vec4_float_one_, vec4_float_zero_); vec4_float_one_, vec4_float_zero_);
@ -582,7 +582,7 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
case AluVectorOpcode::kSne: { case AluVectorOpcode::kSne: {
// foreach(el) src0 != src1 ? 1.0 : 0.0 // foreach(el) src0 != src1 ? 1.0 : 0.0
auto c = b.createBinOp(spv::Op::OpFOrdNotEqual, vec4_float_type_, auto c = b.createBinOp(spv::Op::OpFOrdNotEqual, vec4_bool_type_,
sources[0], sources[1]); sources[0], sources[1]);
dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c, dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c,
vec4_float_one_, vec4_float_zero_); vec4_float_one_, vec4_float_zero_);
@ -726,7 +726,7 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
case AluScalarOpcode::kRsq: { case AluScalarOpcode::kRsq: {
// dest = src0 != 0.0 ? inversesqrt(src0) : 0.0; // dest = src0 != 0.0 ? inversesqrt(src0) : 0.0;
auto c = b.createBinOp(spv::Op::OpFOrdEqual, float_type_, sources[0], auto c = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, sources[0],
b.makeFloatConstant(0.f)); b.makeFloatConstant(0.f));
auto d = CreateGlslStd450InstructionCall( auto d = CreateGlslStd450InstructionCall(
spv::Decoration::DecorationInvariant, vec4_float_type_, spv::Decoration::DecorationInvariant, vec4_float_type_,