commit 6f1b765a4392aec42d6b723974fd099656be73e1
author Chris Forbes <chrisforbes@google.com> Tue Apr 30 13:01:47 2019 -0700
committer Chris Forbes <chrisforbes@google.com> Tue Apr 30 20:54:59 2019 +0000
tree 62c3347e439b037924852b36c1cc6c61e319bf4c
parent 5b09dd109681fcf147ff6fbf7ed449e38fec31b9

Set correct variant for OpImageFetch

Fixes interaction with ImageInstruction rework in previous patch

Bug: b/129523279
Test: dEQP-VK.image.*
Change-Id: I3c0ff7d4497f95f67dc9fc08ad8793f81f7c5f2c
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/30228
Tested-by: Chris Forbes <chrisforbes@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Pipeline/SpirvShader.cpp

diff --git a/src/Pipeline/SpirvShader.cpp b/src/Pipeline/SpirvShader.cpp
index 23499f9..c28f22e 100644
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -4504,7 +4504,7 @@
 
 	SpirvShader::EmitResult SpirvShader::EmitImageFetch(InsnIterator insn, EmitState *state) const
 	{
-		return EmitImageSample({Fetch}, insn, state);
+		return EmitImageSample({None, Fetch}, insn, state);
 	}
 
 	SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instruction, InsnIterator insn, EmitState *state) const