Fix stale SPIRV_SHADER_DBG statements
Following the CLs enabling bufferDeviceAddress, some SPIRV_SHADER_DBG
were using some variables which were either no longer of a printable
type, or simply no longer existed. This CL corrects these statements
to reflect the current variables being used.
Bug: b/236842997
Change-Id: Idd199b77931f9b81c62451cae21c585a4cf09654
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/66672
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Commit-Queue: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
diff --git a/src/Pipeline/SpirvShader.cpp b/src/Pipeline/SpirvShader.cpp
index 69d39cb..3afccde 100644
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -2456,6 +2456,10 @@
auto &lhs = state->getPointer(insn.word(4));
auto &rhs = state->getPointer(insn.word(5));
state->createPointer(insn.resultId(), SIMD::Pointer::IfThenElse(cond.Int(0), lhs, rhs));
+
+ SPIRV_SHADER_DBG("{0}: {1}", insn.word(3), cond);
+ SPIRV_SHADER_DBG("{0}: {1}", insn.word(4), lhs);
+ SPIRV_SHADER_DBG("{0}: {1}", insn.word(5), rhs);
}
break;
default:
@@ -2468,15 +2472,15 @@
auto sel = cond.Int(condIsScalar ? 0 : i);
dst.move(i, (sel & lhs.Int(i)) | (~sel & rhs.Int(i))); // TODO: IfThenElse()
}
+
+ SPIRV_SHADER_DBG("{0}: {1}", insn.word(2), dst);
+ SPIRV_SHADER_DBG("{0}: {1}", insn.word(3), cond);
+ SPIRV_SHADER_DBG("{0}: {1}", insn.word(4), lhs);
+ SPIRV_SHADER_DBG("{0}: {1}", insn.word(5), rhs);
}
break;
}
- SPIRV_SHADER_DBG("{0}: {1}", insn.word(2), result);
- SPIRV_SHADER_DBG("{0}: {1}", insn.word(3), cond);
- SPIRV_SHADER_DBG("{0}: {1}", insn.word(4), lhs);
- SPIRV_SHADER_DBG("{0}: {1}", insn.word(5), rhs);
-
return EmitResult::Continue;
}
