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