commit e6a3153888f05abf61e2d9b840910284163a0cc7
author Nicolas Capens <capn@google.com> Mon Nov 28 11:35:43 2022 -0500
committer Nicolas Capens <nicolascapens@google.com> Fri Dec 02 21:35:25 2022 +0000
tree 56bda08b75214475e4226d51be70bbb07db64ed4
parent 33b63f98a30d91c295063032eda2ecbe0df65460

Use helper function for SPIR-V explicit layout storage classes

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

src/Pipeline/SpirvShader.cpp

diff --git a/src/Pipeline/SpirvShader.cpp b/src/Pipeline/SpirvShader.cpp
index 8099e31..ec80856 100644
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -2319,10 +2319,7 @@
 		}
 	}
 
-	if(type.storageClass == spv::StorageClassPushConstant ||
-	   type.storageClass == spv::StorageClassUniform ||
-	   type.storageClass == spv::StorageClassStorageBuffer ||
-	   type.storageClass == spv::StorageClassPhysicalStorageBuffer)
+	if(Spirv::IsExplicitLayout(type.storageClass))
 	{
 		auto ptr = WalkExplicitLayoutAccessChain(baseId, elementId, Span(insn, indexId, insn.wordCount() - indexId), nonUniform);
 		createPointer(resultId, ptr);