vulkan: fix shader cross-stage io (varying) location mapping.

love2d · Apr 8, 2024 · d40b78b · d40b78b
1 parent 994079e
commit d40b78b
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/src/modules/graphics/vulkan/Shader.cpp b/src/modules/graphics/vulkan/Shader.cpp
@@ -41,6 +41,11 @@ static const uint32_t DESCRIPTOR_POOL_SIZE = 1000;
 class BindingMapper
 {
 public:
+
+	BindingMapper(spv::Decoration decoration)
+		: decoration(decoration)
+	{}
+
 	uint32_t operator()(spirv_cross::CompilerGLSL &comp, std::vector<uint32_t> &spirv, const std::string &name, int count, const spirv_cross::ID &id)
 	{
 		auto it = bindingMappings.find(name);
@@ -58,7 +63,7 @@ class BindingMapper
 				uint32_t freeBinding = getFreeBinding(count);
 
 				uint32_t binaryBindingOffset;
-				if (!comp.get_binary_offset_for_decoration(id, spv::DecorationBinding, binaryBindingOffset))
+				if (!comp.get_binary_offset_for_decoration(id, decoration, binaryBindingOffset))
 					throw love::Exception("could not get binary offset for uniform %s binding", name.c_str());
 
 				spirv[binaryBindingOffset] = freeBinding;
@@ -73,7 +78,7 @@ class BindingMapper
 			auto binding = (uint32_t)it->second.getOffset();
 
 			uint32_t binaryBindingOffset;
-			if (!comp.get_binary_offset_for_decoration(id, spv::DecorationBinding, binaryBindingOffset))
+			if (!comp.get_binary_offset_for_decoration(id, decoration, binaryBindingOffset))
 				throw love::Exception("could not get binary offset for uniform %s binding", name.c_str());
 
 			spirv[binaryBindingOffset] = binding;
@@ -104,6 +109,7 @@ class BindingMapper
 		return true;
 	}
 
+	spv::Decoration decoration;
 	std::map<std::string, Range> bindingMappings;
 
 };
@@ -570,7 +576,8 @@ void Shader::compileShaders()
 	if (!program->mapIO())
 		throw love::Exception("mapIO failed");
 
-	BindingMapper bindingMapper;
+	BindingMapper bindingMapper(spv::DecorationBinding);
+	BindingMapper ioLocationMapper(spv::DecorationLocation);
 
 	for (int i = 0; i < SHADERSTAGE_MAX_ENUM; i++)
 	{
@@ -711,6 +718,24 @@ void Shader::compileShaders()
 
 				attributes[r.name] = index;
 			}
+
+			for (const auto &r : shaderResources.stage_outputs)
+			{
+				const auto &type = comp.get_type(r.type_id);
+				int count = type.array.empty() ? 1 : type.array[0];
+
+				ioLocationMapper(comp, spirv, r.name, count, r.id);
+			}
+		}
+		else if (shaderStage == SHADERSTAGE_PIXEL)
+		{
+			for (const auto &r : shaderResources.stage_inputs)
+			{
+				const auto &type = comp.get_type(r.type_id);
+				int count = type.array.empty() ? 1 : type.array[0];
+
+				ioLocationMapper(comp, spirv, r.name, count, r.id);
+			}
 		}
 
 		VkShaderModuleCreateInfo createInfo{};