metal: fix varying matrices and arrays.

love2d · Apr 13, 2024 · 59e18df · 59e18df
1 parent 4a0e24c
commit 59e18df
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/modules/graphics/metal/Shader.mm b/src/modules/graphics/metal/Shader.mm
@@ -476,9 +476,15 @@ static EShLanguage getGLSLangStage(ShaderStageType stage)
 
 			for (const auto &varying : resources.stage_outputs)
 			{
-//				printf("vertex shader output %s: %d\n", inp.name.c_str(), msl.get_decoration(inp.id, spv::DecorationLocation));
 				varyings[varying.name] = nextVaryingLocation;
-				msl.set_decoration(varying.id, spv::DecorationLocation, nextVaryingLocation++);
+				msl.set_decoration(varying.id, spv::DecorationLocation, nextVaryingLocation);
+
+				const auto &type = msl.get_type(varying.base_type_id);
+				int count = type.array.empty() ? 1 : type.array[0];
+				if (type.op == spv::OpTypeMatrix)
+					count *= type.columns;
+
+				nextVaryingLocation += count;
 			}
 		}
 		else if (stageindex == SHADERSTAGE_PIXEL)