Remove more stale renderer plumbing

src/Device/Context.cpp

@@ -149,7 +149,6 @@ namespace sw
 
 		cullMode = CULL_CLOCKWISE;
 		frontFacingCCW = true;
-		alphaReference = 0.0f;
 
 		depthBias = 0.0f;
 		slopeDepthBias = 0.0f;
@@ -170,7 +169,6 @@ namespace sw
 
 		lineWidth = 1.0f;
 
-		writeSRGB = false;
 		sampleMask = 0xFFFFFFFF;
 		alphaToCoverage = false;
 	}
@@ -245,13 +243,6 @@ namespace sw
 		return modified;
 	}
 
-	bool Context::setWriteSRGB(bool sRGB)
-	{
-		bool modified = (Context::writeSRGB != sRGB);
-		Context::writeSRGB = sRGB;
-		return modified;
-	}
-
 	bool Context::depthWriteActive()
 	{
 		if(!depthBufferActive()) return false;

src/Device/Context.hpp

@@ -132,8 +132,6 @@ namespace sw
 		VkBlendFactor destBlendFactorAlpha();
 		VkBlendOp blendOperationAlpha();
 
-		VkLogicOp colorLogicOp();
-
 		VkPrimitiveTopology topology;
 
 		bool stencilEnable;
@@ -144,7 +142,6 @@ namespace sw
 		// Pixel processor states
 		VkCullModeFlags cullMode;
 		bool frontFacingCCW;
-		float alphaReference;
 
 		float depthBias;
 		float slopeDepthBias;
@@ -160,11 +157,8 @@ namespace sw
 		void *indexBuffer;
 
 		vk::ImageView *renderTarget[RENDERTARGETS];
-		unsigned int renderTargetLayer[RENDERTARGETS];
 		vk::ImageView *depthBuffer;
-		unsigned int depthBufferLayer;
 		vk::ImageView *stencilBuffer;
-		unsigned int stencilBufferLayer;
 
 		vk::PipelineLayout const *pipelineLayout;
 
@@ -197,7 +191,6 @@ namespace sw
 		float lineWidth;
 
 		int colorWriteMask[RENDERTARGETS];   // RGBA
-		bool writeSRGB;
 		unsigned int sampleMask;
 		unsigned int multiSampleMask;
 		int sampleCount;

src/Device/PixelProcessor.cpp

@@ -69,27 +69,19 @@ namespace sw
 		routineCache = nullptr;
 	}
 
-	void PixelProcessor::setRenderTarget(int index, vk::ImageView* renderTarget, unsigned int layer)
+	void PixelProcessor::setRenderTarget(int index, vk::ImageView* renderTarget)
 	{
 		context->renderTarget[index] = renderTarget;
-		context->renderTargetLayer[index] = layer;
 	}
 
-	void PixelProcessor::setDepthBuffer(vk::ImageView *depthBuffer, unsigned int layer)
+	void PixelProcessor::setDepthBuffer(vk::ImageView *depthBuffer)
 	{
 		context->depthBuffer = depthBuffer;
-		context->depthBufferLayer = layer;
 	}
 
-	void PixelProcessor::setStencilBuffer(vk::ImageView *stencilBuffer, unsigned int layer)
+	void PixelProcessor::setStencilBuffer(vk::ImageView *stencilBuffer)
 	{
 		context->stencilBuffer = stencilBuffer;
-		context->stencilBufferLayer = layer;
-	}
-
-	void PixelProcessor::setWriteSRGB(bool sRGB)
-	{
-		context->setWriteSRGB(sRGB);
 	}
 
 	void PixelProcessor::setDepthBufferEnable(bool depthBufferEnable)
@@ -323,8 +315,7 @@ namespace sw
 			state.targetFormat[i] = context->renderTargetInternalFormat(i);
 		}
 
-		state.writeSRGB	= context->writeSRGB && context->renderTarget[0] && context->renderTarget[0]->getFormat().isSRGBwritable();
-		state.multiSample = context->sampleCount;
+		state.multiSample = static_cast<unsigned int>(context->sampleCount);
 		state.multiSampleMask = context->multiSampleMask;
 
 		if(state.multiSample > 1 && context->pixelShader)

src/Device/PixelProcessor.hpp

@@ -58,7 +58,6 @@ namespace sw
 
 			unsigned int colorWriteMask;
 			VkFormat targetFormat[RENDERTARGETS];
-			bool writeSRGB;
 			unsigned int multiSample;
 			unsigned int multiSampleMask;
 			bool alphaToCoverage;
@@ -127,20 +126,16 @@ namespace sw
 
 		virtual ~PixelProcessor();
 
-		void setRenderTarget(int index, vk::ImageView *renderTarget, unsigned int layer = 0);
-		void setDepthBuffer(vk::ImageView *depthBuffer, unsigned int layer = 0);
-		void setStencilBuffer(vk::ImageView *stencilBuffer, unsigned int layer = 0);
+		void setRenderTarget(int index, vk::ImageView *renderTarget);
+		void setDepthBuffer(vk::ImageView *depthBuffer);
+		void setStencilBuffer(vk::ImageView *stencilBuffer);
 
-		void setWriteSRGB(bool sRGB);
 		void setDepthBufferEnable(bool depthBufferEnable);
 		void setDepthCompare(VkCompareOp depthCompareMode);
 		void setDepthWriteEnable(bool depthWriteEnable);
 		void setCullMode(CullMode cullMode, bool frontFacingCCW);
 		void setColorWriteMask(int index, int rgbaMask);
 
-		void setColorLogicOpEnabled(bool colorLogicOpEnabled);
-		void setLogicalOperation(VkLogicOp logicalOperation);
-
 		void setBlendConstant(const Color<float> &blendConstant);
 
 		void setAlphaBlendEnable(bool alphaBlendEnable);

src/Device/Renderer.cpp

@@ -310,7 +310,6 @@ namespace sw
 		updateConfiguration();
 
 		int ms = context->sampleCount;
-		unsigned int oldMultiSampleMask = context->multiSampleMask;
 		context->multiSampleMask = context->sampleMask & ((unsigned)0xFFFFFFFF >> (32 - ms));
 
 		if(!context->multiSampleMask)
@@ -330,7 +329,7 @@ namespace sw
 
 		sync->lock(sw::PRIVATE);
 
-		if(update || oldMultiSampleMask != context->multiSampleMask)
+		if(update)
 		{
 			vertexState = VertexProcessor::update(topology);
 			setupState = SetupProcessor::update();
@@ -507,8 +506,7 @@ namespace sw
 
 				if(draw->renderTarget[index])
 				{
-					VkOffset3D offset = { 0, 0, static_cast<int32_t>(context->renderTargetLayer[index]) };
-					data->colorBuffer[index] = (unsigned int*)context->renderTarget[index]->getOffsetPointer(offset, VK_IMAGE_ASPECT_COLOR_BIT);
+					data->colorBuffer[index] = (unsigned int*)context->renderTarget[index]->getOffsetPointer({0, 0, 0}, VK_IMAGE_ASPECT_COLOR_BIT);
 					data->colorPitchB[index] = context->renderTarget[index]->rowPitchBytes(VK_IMAGE_ASPECT_COLOR_BIT, 0);
 					data->colorSliceB[index] = context->renderTarget[index]->slicePitchBytes(VK_IMAGE_ASPECT_COLOR_BIT, 0);
 				}
@@ -519,16 +517,14 @@ namespace sw
 
 			if(draw->depthBuffer)
 			{
-				VkOffset3D offset = { 0, 0, static_cast<int32_t>(context->depthBufferLayer) };
-				data->depthBuffer = (float*)context->depthBuffer->getOffsetPointer(offset, VK_IMAGE_ASPECT_DEPTH_BIT);
+				data->depthBuffer = (float*)context->depthBuffer->getOffsetPointer({0, 0, 0}, VK_IMAGE_ASPECT_DEPTH_BIT);
 				data->depthPitchB = context->depthBuffer->rowPitchBytes(VK_IMAGE_ASPECT_DEPTH_BIT, 0);
 				data->depthSliceB = context->depthBuffer->slicePitchBytes(VK_IMAGE_ASPECT_DEPTH_BIT, 0);
 			}
 
 			if(draw->stencilBuffer)
 			{
-				VkOffset3D offset = { 0, 0, static_cast<int32_t>(context->stencilBufferLayer) };
-				data->stencilBuffer = (unsigned char*)context->stencilBuffer->getOffsetPointer(offset, VK_IMAGE_ASPECT_STENCIL_BIT);
+				data->stencilBuffer = (unsigned char*)context->stencilBuffer->getOffsetPointer({0, 0, 0}, VK_IMAGE_ASPECT_STENCIL_BIT);
 				data->stencilPitchB = context->stencilBuffer->rowPitchBytes(VK_IMAGE_ASPECT_STENCIL_BIT, 0);
 				data->stencilSliceB = context->stencilBuffer->slicePitchBytes(VK_IMAGE_ASPECT_STENCIL_BIT, 0);
 			}

src/Pipeline/PixelProgram.cpp

@@ -125,13 +125,6 @@ namespace sw
 				continue;
 			}
 
-			if(!postBlendSRGB && state.writeSRGB && !isSRGB(index))
-			{
-				c[index].x = linearToSRGB(c[index].x);
-				c[index].y = linearToSRGB(c[index].y);
-				c[index].z = linearToSRGB(c[index].z);
-			}
-
 			switch(state.targetFormat[index])
 			{
 			case VK_FORMAT_R5G6B5_UNORM_PACK16:

src/Pipeline/PixelRoutine.cpp

@@ -1104,7 +1104,7 @@ namespace sw
 			UNIMPLEMENTED("VkFormat %d", state.targetFormat[index]);
 		}
 
-		if((postBlendSRGB && state.writeSRGB) || isSRGB(index))
+		if(postBlendSRGB || isSRGB(index))
 		{
 			sRGBtoLinear16_12_16(pixel);
 		}
@@ -1231,7 +1231,7 @@ namespace sw
 
 	void PixelRoutine::writeColor(int index, Pointer<Byte> &cBuffer, Int &x, Vector4s &current, Int &sMask, Int &zMask, Int &cMask)
 	{
-		if((postBlendSRGB && state.writeSRGB) || isSRGB(index))
+		if(postBlendSRGB || isSRGB(index))
 		{
 			linearToSRGB16_12_16(current);
 		}
@@ -1857,7 +1857,7 @@ namespace sw
 			UNIMPLEMENTED("VkFormat: %d", int(state.targetFormat[index]));
 		}
 
-		if((postBlendSRGB && state.writeSRGB) || isSRGB(index))
+		if(postBlendSRGB || isSRGB(index))
 		{
 			sRGBtoLinear(pixel.x);
 			sRGBtoLinear(pixel.y);

src/Vulkan/VkCommandBuffer.cpp

@@ -429,7 +429,7 @@ void CommandBuffer::ExecutionState::bindAttachments()
 		if (attachmentReference.attachment != VK_ATTACHMENT_UNUSED)
 		{
 			auto attachment = renderPassFramebuffer->getAttachment(attachmentReference.attachment);
-			renderer->setRenderTarget(i, attachment, 0);
+			renderer->setRenderTarget(i, attachment);
 		}
 	}
 
@@ -439,11 +439,11 @@ void CommandBuffer::ExecutionState::bindAttachments()
 		auto attachment = renderPassFramebuffer->getAttachment(attachmentReference->attachment);
 		if (attachment->hasDepthAspect())
 		{
-			renderer->setDepthBuffer(attachment, 0);
+			renderer->setDepthBuffer(attachment);
 		}
 		if (attachment->hasStencilAspect())
 		{
-			renderer->setStencilBuffer(attachment, 0);
+			renderer->setStencilBuffer(attachment);
 		}
 	}
 }