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>
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;