Pass baseVertex to vertex shader

src/Device/Renderer.cpp

@@ -296,7 +296,7 @@ namespace sw
 		sw::deallocate(mem);
 	}
 
-	void Renderer::draw(VkPrimitiveTopology topology, VkIndexType indexType, unsigned int count, bool update)
+	void Renderer::draw(VkPrimitiveTopology topology, VkIndexType indexType, unsigned int count, int baseVertex, bool update)
 	{
 		#ifndef NDEBUG
 			if(count < minPrimitives || count > maxPrimitives)
@@ -425,6 +425,8 @@ namespace sw
 			data->instanceID = context->instanceID;
 		}
 
+		data->baseVertex = baseVertex;
+
 		if(pixelState.stencilActive)
 		{
 			data->stencil[0].set(context->frontStencil.reference, context->frontStencil.compareMask, context->frontStencil.writeMask);

src/Device/Renderer.hpp

@@ -99,6 +99,7 @@ namespace sw
 		const void *indices;
 
 		int instanceID;
+		int baseVertex;
 		float lineWidth;
 
 		PixelProcessor::Stencil stencil[2];   // clockwise, counterclockwise
@@ -202,7 +203,7 @@ namespace sw
 		void *operator new(size_t size);
 		void operator delete(void * mem);
 
-		void draw(VkPrimitiveTopology topology, VkIndexType indexType, unsigned int count, bool update = true);
+		void draw(VkPrimitiveTopology topology, VkIndexType indexType, unsigned int count, int baseVertex, bool update = true);
 
 		void setContext(const sw::Context& context);
 

src/Pipeline/VertexProgram.cpp

@@ -57,7 +57,7 @@ namespace sw
 		{
 			assert(it->second.SizeInComponents == 1);
 			routine.getVariable(it->second.Id)[it->second.FirstComponent] =
-					As<Float4>(Int4(index) + Int4(0, 1, 2, 3));
+					As<Float4>(Int4(As<Int>(index) + *Pointer<Int>(data + OFFSET(DrawData, baseVertex))) + Int4(0, 1, 2, 3));
 		}
 
 		auto activeLaneMask = SIMD::Int(0xFFFFFFFF); // TODO: Control this.

src/Vulkan/VkCommandBuffer.cpp

@@ -523,7 +523,7 @@ struct DrawBase : public CommandBuffer::Command
 		for(uint32_t instance = firstInstance; instance != firstInstance + instanceCount; instance++)
 		{
 			executionState.renderer->setInstanceID(instance);
-			executionState.renderer->draw(context.topology, executionState.indexType, primitiveCount);
+			executionState.renderer->draw(context.topology, executionState.indexType, primitiveCount, vertexOffset);
 			executionState.renderer->advanceInstanceAttributes();
 		}
 	}