Fix various issues in vertex fetch setup

src/Device/Stream.hpp

@@ -87,6 +87,8 @@ namespace sw
 			type = STREAMTYPE_FLOAT;
 			count = 0;
 			normalized = false;
+			offset = 0;
+			binding = 0;
 
 			return *this;
 		}
@@ -99,6 +101,8 @@ namespace sw
 		StreamType type;
 		unsigned char count;
 		bool normalized;
+		unsigned int offset;
+		unsigned int binding;
 	};
 }
 

src/Pipeline/VertexRoutine.cpp

@@ -88,10 +88,10 @@ namespace sw
 				spirvShader->inputs[i + 3].Type != SpirvShader::ATTRIBTYPE_UNUSED)
 			{
 
-				Pointer<Byte> input = *Pointer<Pointer<Byte>>(data + OFFSET(DrawData, input) + sizeof(void *) * i);
-				UInt stride = *Pointer<UInt>(data + OFFSET(DrawData, stride) + sizeof(unsigned int) * i);
+				Pointer<Byte> input = *Pointer<Pointer<Byte>>(data + OFFSET(DrawData, input) + sizeof(void *) * (i/4));
+				UInt stride = *Pointer<UInt>(data + OFFSET(DrawData, stride) + sizeof(unsigned int) * (i/4));
 
-				auto value = readStream(input, stride, state.input[i], index);
+				auto value = readStream(input, stride, state.input[i/4], index);
 				routine.inputs[i] = value.x;
 				routine.inputs[i+1] = value.y;
 				routine.inputs[i+2] = value.z;

src/Vulkan/VkCommandBuffer.cpp

@@ -155,9 +155,14 @@ struct Draw : public CommandBuffer::Command
 		sw::Context context = pipeline->getContext();
 		for(uint32_t i = 0; i < MAX_VERTEX_INPUT_BINDINGS; i++)
 		{
-			const auto& vertexInput = executionState.vertexInputBindings[i];
-			Buffer* buffer = Cast(vertexInput.buffer);
-			context.input[i].buffer = buffer ? buffer->getOffsetPointer(vertexInput.offset + context.input[i].stride * firstVertex) : nullptr;
+			auto &attrib = context.input[i];
+			if (attrib.count)
+			{
+				const auto &vertexInput = executionState.vertexInputBindings[attrib.binding];
+				Buffer *buffer = Cast(vertexInput.buffer);
+				attrib.buffer = buffer ? buffer->getOffsetPointer(
+						attrib.offset + vertexInput.offset + attrib.stride * firstVertex) : nullptr;
+			}
 		}
 
 		executionState.renderer->setContext(context);
@@ -567,9 +572,9 @@ void CommandBuffer::bindPipeline(VkPipelineBindPoint pipelineBindPoint, VkPipeli
 void CommandBuffer::bindVertexBuffers(uint32_t firstBinding, uint32_t bindingCount,
                                       const VkBuffer* pBuffers, const VkDeviceSize* pOffsets)
 {
-	for(uint32_t i = firstBinding; i < (firstBinding + bindingCount); ++i)
+	for(uint32_t i = 0; i < bindingCount; ++i)
 	{
-		addCommand<VertexBufferBind>(i, pBuffers[i], pOffsets[i]);
+		addCommand<VertexBufferBind>(i + firstBinding, pBuffers[i], pOffsets[i]);
 	}
 }
 

src/Vulkan/VkPipeline.cpp

@@ -229,11 +229,14 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn
 		UNIMPLEMENTED();
 	}
 
+	// Temporary in-binding-order representation of buffer strides, to be consumed below
+	// when considering attributes. TODO: unfuse buffers from attributes in backend, is old GL model.
+	uint32_t bufferStrides[MAX_VERTEX_INPUT_BINDINGS];
 	for(uint32_t i = 0; i < vertexInputState->vertexBindingDescriptionCount; i++)
 	{
-		const VkVertexInputBindingDescription* vertexBindingDescription = vertexInputState->pVertexBindingDescriptions;
-		context.input[vertexBindingDescription->binding].stride = vertexBindingDescription->stride;
-		if(vertexBindingDescription->inputRate != VK_VERTEX_INPUT_RATE_VERTEX)
+		auto const & desc = vertexInputState->pVertexBindingDescriptions[i];
+		bufferStrides[desc.binding] = desc.stride;
+		if(desc.inputRate != VK_VERTEX_INPUT_RATE_VERTEX)
 		{
 			UNIMPLEMENTED();
 		}
@@ -241,20 +244,14 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn
 
 	for(uint32_t i = 0; i < vertexInputState->vertexAttributeDescriptionCount; i++)
 	{
-		const VkVertexInputAttributeDescription* vertexAttributeDescriptions = vertexInputState->pVertexAttributeDescriptions;
-		sw::Stream& input = context.input[vertexAttributeDescriptions->binding];
-		input.count = getNumberOfChannels(vertexAttributeDescriptions->format);
-		input.type = getStreamType(vertexAttributeDescriptions->format);
-		input.normalized = !sw::Surface::isNonNormalizedInteger(vertexAttributeDescriptions->format);
-
-		if(vertexAttributeDescriptions->location != vertexAttributeDescriptions->binding)
-		{
-			UNIMPLEMENTED();
-		}
-		if(vertexAttributeDescriptions->offset != 0)
-		{
-			UNIMPLEMENTED();
-		}
+		auto const & desc = vertexInputState->pVertexAttributeDescriptions[i];
+		sw::Stream& input = context.input[desc.location];
+		input.count = getNumberOfChannels(desc.format);
+		input.type = getStreamType(desc.format);
+		input.normalized = !sw::Surface::isNonNormalizedInteger(desc.format);
+		input.offset = desc.offset;
+		input.binding = desc.binding;
+		input.stride = bufferStrides[desc.binding];
 	}
 
 	const VkPipelineInputAssemblyStateCreateInfo* assemblyState = pCreateInfo->pInputAssemblyState;