commit ae17ef6d12d80892badeb1f27cbbbe38955c35db
author Nicolas Capens <capn@google.com> Wed Apr 27 16:12:53 2022 -0400
committer Nicolas Capens <nicolascapens@google.com> Wed May 04 02:49:00 2022 +0000
tree b072448911c55bb2067a64a9bdef16107711466e
parent f9159297a54474ad64def5e5428ec7a816ce4f90

Always enable MemorySanitizer instrumentation for sampling routines

Bug: b/188205704
Change-Id: I32260dab8acffb7fbaa152fa86266da78aca46af
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/65548
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Commit-Queue: Nicolas Capens <nicolascapens@google.com>

src/Pipeline/SpirvShaderSampling.cpp

diff --git a/src/Pipeline/SpirvShaderSampling.cpp b/src/Pipeline/SpirvShaderSampling.cpp
index ceaa0d8..356282e 100644
--- a/src/Pipeline/SpirvShaderSampling.cpp
+++ b/src/Pipeline/SpirvShaderSampling.cpp
@@ -39,6 +39,8 @@
 	vk::Device::SamplingRoutineCache::Key key = { signature, samplerId, imageViewId };
 
 	auto createSamplingRoutine = [device](const vk::Device::SamplingRoutineCache::Key &key) {
+		ScopedPragma msan(MemorySanitizerInstrumentation, true);
+
 		ImageInstructionSignature instruction(key.instruction);
 		const vk::Identifier::State imageViewState = vk::Identifier(key.imageView).getState();
 		const vk::SamplerState *vkSamplerState = (key.sampler != 0) ? device->findSampler(key.sampler) : nullptr;