Removed stencil reference from PixelProcessor::States

src/Device/PixelProcessor.hpp

@@ -33,6 +33,28 @@ namespace sw
 	public:
 		struct States : Memset<States>
 		{
+			// Same as VkStencilOpState, but with no reference, as it's not part of the state
+			// (it doesn't require a different program to be generated)
+			struct StencilOpState
+			{
+				VkStencilOp    failOp;
+				VkStencilOp    passOp;
+				VkStencilOp    depthFailOp;
+				VkCompareOp    compareOp;
+				uint32_t       compareMask;
+				uint32_t       writeMask;
+
+				void operator=(const VkStencilOpState &rhs)
+				{
+					failOp = rhs.failOp;
+					passOp = rhs.passOp;
+					depthFailOp = rhs.depthFailOp;
+					compareOp = rhs.compareOp;
+					compareMask = rhs.compareMask;
+					writeMask = rhs.writeMask;
+				}
+			};
+
 			States() : Memset(this, 0) {}
 
 			uint32_t computeHash();
@@ -44,8 +66,8 @@ namespace sw
 			bool quadLayoutDepthBuffer;
 
 			bool stencilActive;
-			VkStencilOpState frontStencil;
-			VkStencilOpState backStencil;
+			StencilOpState frontStencil;
+			StencilOpState backStencil;
 
 			bool depthTestActive;
 			bool occlusionEnabled;

src/Pipeline/PixelRoutine.cpp

@@ -749,7 +749,7 @@ namespace sw
 		*Pointer<Byte4>(buffer) = Byte4(newValue);
 	}
 
-	void PixelRoutine::stencilOperation(Byte8 &newValue, Byte8 &bufferValue, VkStencilOpState const &ops, bool isBack, Int &zMask, Int &sMask)
+	void PixelRoutine::stencilOperation(Byte8 &newValue, Byte8 &bufferValue, PixelProcessor::States::StencilOpState const &ops, bool isBack, Int &zMask, Int &sMask)
 	{
 		Byte8 &pass = newValue;
 		Byte8 fail;

src/Pipeline/PixelRoutine.hpp

@@ -67,7 +67,7 @@ namespace sw
 		Float4 interpolateCentroid(Float4 &x, Float4 &y, Float4 &rhw, Pointer<Byte> planeEquation, bool flat, bool perspective);
 		void stencilTest(Pointer<Byte> &sBuffer, int q, Int &x, Int &sMask, Int &cMask);
 		void stencilTest(Byte8 &value, VkCompareOp stencilCompareMode, bool isBack);
-		void stencilOperation(Byte8 &newValue, Byte8 &bufferValue, VkStencilOpState const &ops, bool isBack, Int &zMask, Int &sMask);
+		void stencilOperation(Byte8 &newValue, Byte8 &bufferValue, PixelProcessor::States::StencilOpState const &ops, bool isBack, Int &zMask, Int &sMask);
 		void stencilOperation(Byte8 &output, Byte8 &bufferValue, VkStencilOp operation, bool isBack);
 		Bool depthTest(Pointer<Byte> &zBuffer, int q, Int &x, Float4 &z, Int &sMask, Int &zMask, Int &cMask);