Change scissor type from sw::Rect to VkRect2D

src/Device/Renderer.cpp

@@ -438,10 +438,10 @@ namespace sw
 
 		// Scissor
 		{
-			data->scissorX0 = scissor.x0;
-			data->scissorX1 = scissor.x1;
-			data->scissorY0 = scissor.y0;
-			data->scissorY1 = scissor.y1;
+			data->scissorX0 = scissor.offset.x;
+			data->scissorX1 = scissor.offset.x + scissor.extent.width;
+			data->scissorY0 = scissor.offset.y;
+			data->scissorY1 = scissor.offset.y + scissor.extent.height;
 		}
 
 		draw->primitive = 0;
@@ -1604,7 +1604,7 @@ namespace sw
 		this->viewport = viewport;
 	}
 
-	void Renderer::setScissor(const Rect &scissor)
+	void Renderer::setScissor(const VkRect2D &scissor)
 	{
 		this->scissor = scissor;
 	}

src/Device/Renderer.hpp

@@ -267,7 +267,7 @@ namespace sw
 
 		// Viewport & Clipper
 		void setViewport(const VkViewport &viewport);
-		void setScissor(const Rect &scissor);
+		void setScissor(const VkRect2D &scissor);
 
 		void addQuery(Query *query);
 		void removeQuery(Query *query);
@@ -311,7 +311,7 @@ namespace sw
 		Clipper *clipper;
 		Blitter *blitter;
 		VkViewport viewport;
-		Rect scissor;
+		VkRect2D scissor;
 		int clipFlags;
 
 		Triangle *triangleBatch[16];

src/Vulkan/VkPipeline.cpp

@@ -57,11 +57,6 @@ sw::DrawType Convert(VkPrimitiveTopology topology)
 	return sw::DRAW_TRIANGLELIST;
 }
 
-sw::Rect Convert(const VkRect2D& rect)
-{
-	return sw::Rect(rect.offset.x, rect.offset.y, rect.offset.x + rect.extent.width, rect.offset.y + rect.extent.height);
-}
-
 sw::StreamType getStreamType(VkFormat format)
 {
 	switch(format)
@@ -331,7 +326,7 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn
 			UNIMPLEMENTED();
 		}
 
-		scissor = Convert(viewportState->pScissors[0]);
+		scissor = viewportState->pScissors[0];
 		viewport = viewportState->pViewports[0];
 	}
 
@@ -517,7 +512,7 @@ const sw::Context& GraphicsPipeline::getContext() const
 	return context;
 }
 
-const sw::Rect& GraphicsPipeline::getScissor() const
+const VkRect2D& GraphicsPipeline::getScissor() const
 {
 	return scissor;
 }

src/Vulkan/VkPipeline.hpp

@@ -71,7 +71,7 @@ public:
 
 	uint32_t computePrimitiveCount(uint32_t vertexCount) const;
 	const sw::Context& getContext() const;
-	const sw::Rect& getScissor() const;
+	const VkRect2D& getScissor() const;
 	const VkViewport& getViewport() const;
 	const sw::Color<float>& getBlendConstants() const;
 
@@ -80,7 +80,7 @@ private:
 	sw::SpirvShader *fragmentShader = nullptr;
 
 	sw::Context context;
-	sw::Rect scissor;
+	VkRect2D scissor;
 	VkViewport viewport;
 	sw::Color<float> blendConstants;
 };