MSL: Improve handling of array types in buffer objects.

When loading and storing array types which belong to buffer objects, we
need to treat these values as not being value types. Also, need to
handle array load/store from/to more address space combinations.

1 files changed, 6 insertions, 1 deletions

diff --git a/spirv_cross.cpp b/spirv_cross.cpp
index 7c227a3d..f9b26a66 100644
--- a/spirv_cross.cpp
+++ b/spirv_cross.cpp
@@ -277,7 +277,12 @@ StorageClass Compiler::get_backing_variable_storage(uint32_t ptr)
 {
 	auto *var = maybe_get_backing_variable(ptr);
 	if (var)
-		return var->storage;
+	{
+		if (var->storage == StorageClassUniform && has_decoration(get<SPIRType>(var->basetype).self, DecorationBufferBlock))
+			return StorageClassStorageBuffer;
+		else
+			return var->storage;
+	}
 	else
 		return expression_type(ptr).storage;
 }