Fix SPIRV_SHADER_ENABLE_DBG
This bit-rotted over the last couple of years.
Make it usable again.
Bug: none
Change-Id: I03faffec80f2c8c29798d7842480e26bdbc3c1f2
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71108
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro-Result: Ben Clayton <bclayton@google.com>
diff --git a/src/Pipeline/SpirvShader.cpp b/src/Pipeline/SpirvShader.cpp
index ec80856..2b1ffb2 100644
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -1906,8 +1906,8 @@
vk::SPIRV_VERSION,
insn.data(),
insn.wordCount(),
- insns.data(),
- insns.size(),
+ shader.insns.data(),
+ shader.insns.size(),
SPV_BINARY_TO_TEXT_OPTION_NO_HEADER);
SPIRV_SHADER_DBG("{0}", text);
}
diff --git a/src/Pipeline/SpirvShader.hpp b/src/Pipeline/SpirvShader.hpp
index ed2ffa8..f89b42f 100644
--- a/src/Pipeline/SpirvShader.hpp
+++ b/src/Pipeline/SpirvShader.hpp
@@ -104,6 +104,7 @@
{
ASSERT(i < componentCount);
ASSERT(scalar[i] != nullptr);
+ RR_PRINT_ONLY(typeHint = TypeHint::Float;)
return As<SIMD::Float>(scalar[i]); // TODO(b/128539387): RValue<SIMD::Float>(scalar)
}
@@ -111,6 +112,7 @@
{
ASSERT(i < componentCount);
ASSERT(scalar[i] != nullptr);
+ RR_PRINT_ONLY(typeHint = TypeHint::Int;)
return As<SIMD::Int>(scalar[i]); // TODO(b/128539387): RValue<SIMD::Int>(scalar)
}
@@ -118,6 +120,7 @@
{
ASSERT(i < componentCount);
ASSERT(scalar[i] != nullptr);
+ RR_PRINT_ONLY(typeHint = TypeHint::UInt;)
return As<SIMD::UInt>(scalar[i]); // TODO(b/128539387): RValue<SIMD::UInt>(scalar)
}
@@ -142,7 +145,7 @@
#ifdef ENABLE_RR_PRINT
friend struct rr::PrintValue::Ty<sw::Intermediate>;
- TypeHint typeHint = TypeHint::Float;
+ mutable TypeHint typeHint = TypeHint::Float;
#endif // ENABLE_RR_PRINT
};