Pass draw-to-draw varying state directly to Renderer::draw

src/Device/Context.cpp

@@ -128,8 +128,6 @@ namespace sw
 		pixelShader = nullptr;
 		vertexShader = nullptr;
 
-		instanceID = 0;
-
 		occlusionEnabled = false;
 
 		lineWidth = 1.0f;

src/Device/Context.hpp

@@ -82,7 +82,6 @@ namespace sw
 		vk::DescriptorSet::Bindings descriptorSets = {};
 		vk::DescriptorSet::DynamicOffsets descriptorDynamicOffsets = {};
 		Stream input[MAX_INTERFACE_COMPONENTS / 4];
-		void *indexBuffer;
 
 		vk::ImageView *renderTarget[RENDERTARGETS];
 		vk::ImageView *depthBuffer;
@@ -94,10 +93,6 @@ namespace sw
 		const SpirvShader *pixelShader;
 		const SpirvShader *vertexShader;
 
-		// Instancing
-		int instanceID;
-		int viewID;
-
 		bool occlusionEnabled;
 
 		// Pixel processor states
@@ -123,8 +118,6 @@ namespace sw
 		unsigned int multiSampleMask;
 		int sampleCount;
 		bool alphaToCoverage;
-
-		PushConstantStorage pushConstants;
 	};
 }
 

src/Device/Renderer.cpp

@@ -233,7 +233,9 @@ namespace sw
 		sw::deallocate(mem);
 	}
 
-	void Renderer::draw(const sw::Context* context, VkIndexType indexType, unsigned int count, int baseVertex, TaskEvents *events, bool update)
+	void Renderer::draw(const sw::Context* context, VkIndexType indexType, unsigned int count, int baseVertex,
+			TaskEvents *events, int instanceID, int viewID, void *indexBuffer,
+			PushConstantStorage const & pushConstants, bool update)
 	{
 		if(count == 0) { return; }
 
@@ -347,10 +349,9 @@ namespace sw
 			data->stride[i] = context->input[i].vertexStride;
 		}
 
-		data->indices = context->indexBuffer;
-		data->viewID = context->viewID;
-		data->instanceID = context->instanceID;
-
+		data->indices = indexBuffer;
+		data->viewID = viewID;
+		data->instanceID = instanceID;
 		data->baseVertex = baseVertex;
 
 		if(pixelState.stencilActive)
@@ -457,7 +458,7 @@ namespace sw
 
 		// Push constants
 		{
-			data->pushConstants = context->pushConstants;
+			data->pushConstants = pushConstants;
 		}
 
 		draw->primitive = 0;

src/Device/Renderer.hpp

@@ -167,7 +167,9 @@ namespace sw
 
 		bool hasOcclusionQuery() const { return occlusionQuery != nullptr; }
 
-		void draw(const sw::Context* context, VkIndexType indexType, unsigned int count, int baseVertex, TaskEvents *events, bool update = true);
+		void draw(const sw::Context* context, VkIndexType indexType, unsigned int count, int baseVertex,
+				TaskEvents *events, int instanceID, int viewID, void *indexBuffer,
+				PushConstantStorage const & pushConstants, bool update = true);
 
 		// Viewport & Clipper
 		void setViewport(const VkViewport &viewport);

src/Vulkan/VkCommandBuffer.cpp

@@ -523,7 +523,6 @@ struct DrawBase : public CommandBuffer::Command
 
 		context.descriptorSets = pipelineState.descriptorSets;
 		context.descriptorDynamicOffsets = pipelineState.descriptorDynamicOffsets;
-		context.pushConstants = executionState.pushConstants;
 
 		// Apply either pipeline state or dynamic state
 		executionState.renderer->setScissor(pipeline->hasDynamicState(VK_DYNAMIC_STATE_SCISSOR) ?
@@ -569,7 +568,6 @@ struct DrawBase : public CommandBuffer::Command
 
 		executionState.bindAttachments(context);
 
-		context.multiSampleMask = context.sampleMask & ((unsigned) 0xFFFFFFFF >> (32 - context.sampleCount));
 		context.occlusionEnabled = executionState.renderer->hasOcclusionQuery();
 
 		std::vector<std::pair<uint32_t, void *>> indexBuffers;
@@ -603,21 +601,18 @@ struct DrawBase : public CommandBuffer::Command
 
 		for (uint32_t instance = firstInstance; instance != firstInstance + instanceCount; instance++)
 		{
-			context.instanceID = instance;
-
 			// FIXME: reconsider instances/views nesting.
 			auto viewMask = executionState.renderPass->getViewMask(executionState.subpassIndex);
 			while (viewMask)
 			{
-				context.viewID = sw::log2i(viewMask);
-				viewMask &= ~(1 << context.viewID);
+				int viewID = sw::log2i(viewMask);
+				viewMask &= ~(1 << viewID);
 
 				for (auto indexBuffer : indexBuffers)
 				{
-					const uint32_t primitiveCount = indexBuffer.first;
-					context.indexBuffer = indexBuffer.second;
-					executionState.renderer->draw(&context, executionState.indexType, primitiveCount, vertexOffset,
-												  executionState.events);
+					executionState.renderer->draw(&context, executionState.indexType, indexBuffer.first, vertexOffset,
+												  executionState.events, instance, viewID, indexBuffer.second,
+												  executionState.pushConstants);
 				}
 			}
 

src/Vulkan/VkPipeline.cpp

@@ -478,6 +478,8 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn
 			context.sourceBlendFactorState = attachment.srcColorBlendFactor;
 		}
 	}
+
+	context.multiSampleMask = context.sampleMask & ((unsigned) 0xFFFFFFFF >> (32 - context.sampleCount));
 }
 
 void GraphicsPipeline::destroyPipeline(const VkAllocationCallbacks* pAllocator)