Move interpolant clamping out of interpolate()

src/Device/QuadRasterizer.cpp

@@ -231,7 +231,7 @@ void QuadRasterizer::rasterize(Int &yMin, Int &yMax)
 	Until(y >= yMax);
 }
 
-Float4 QuadRasterizer::interpolate(Float4 &x, Float4 &D, Float4 &rhw, Pointer<Byte> planeEquation, bool flat, bool perspective, bool clamp)
+Float4 QuadRasterizer::interpolate(Float4 &x, Float4 &D, Float4 &rhw, Pointer<Byte> planeEquation, bool flat, bool perspective)
 {
 	Float4 interpolant = D;
 
@@ -245,11 +245,6 @@ Float4 QuadRasterizer::interpolate(Float4 &x, Float4 &D, Float4 &rhw, Pointer<By
 		}
 	}
 
-	if(clamp)
-	{
-		interpolant = Min(Max(interpolant, Float4(0.0f)), Float4(1.0f));
-	}
-
 	return interpolant;
 }
 

src/Device/QuadRasterizer.hpp

@@ -46,7 +46,7 @@ protected:
 
 	bool interpolateZ() const;
 	bool interpolateW() const;
-	Float4 interpolate(Float4 &x, Float4 &D, Float4 &rhw, Pointer<Byte> planeEquation, bool flat, bool perspective, bool clamp);
+	Float4 interpolate(Float4 &x, Float4 &D, Float4 &rhw, Pointer<Byte> planeEquation, bool flat, bool perspective);
 
 	const PixelProcessor::State &state;
 	const SpirvShader *const spirvShader;

src/Pipeline/PixelRoutine.cpp

@@ -90,7 +90,12 @@ void PixelRoutine::quad(Pointer<Byte> cBuffer[RENDERTARGETS], Pointer<Byte> &zBu
 				x -= *Pointer<Float4>(constants + OFFSET(Constants, X) + q * sizeof(float4));
 			}
 
-			z[q] = interpolate(x, Dz[q], z[q], primitive + OFFSET(Primitive, z), false, false, state.depthClamp);
+			z[q] = interpolate(x, Dz[q], z[q], primitive + OFFSET(Primitive, z), false, false);
+
+			if(state.depthClamp)
+			{
+				z[q] = Min(Max(z[q], Float4(0.0f)), Float4(1.0f));
+			}
 		}
 	}
 
@@ -133,7 +138,7 @@ void PixelRoutine::quad(Pointer<Byte> cBuffer[RENDERTARGETS], Pointer<Byte> &zBu
 
 		if(interpolateW())
 		{
-			w = interpolate(xxxx, Dw, rhw, primitive + OFFSET(Primitive, w), false, false, false);
+			w = interpolate(xxxx, Dw, rhw, primitive + OFFSET(Primitive, w), false, false);
 			rhw = reciprocal(w, false, false, true);
 
 			if(state.centroid)
@@ -161,7 +166,7 @@ void PixelRoutine::quad(Pointer<Byte> cBuffer[RENDERTARGETS], Pointer<Byte> &zBu
 						routine.inputs[interpolant] =
 						    interpolate(xxxx, Dv[interpolant], rhw,
 						                primitive + OFFSET(Primitive, V[interpolant]),
-						                input.Flat, !input.NoPerspective, false);
+						                input.Flat, !input.NoPerspective);
 					}
 				}
 			}
@@ -172,7 +177,7 @@ void PixelRoutine::quad(Pointer<Byte> cBuffer[RENDERTARGETS], Pointer<Byte> &zBu
 			{
 				auto distance = interpolate(xxxx, DclipDistance[i], rhw,
 				                            primitive + OFFSET(Primitive, clipDistance[i]),
-				                            false, true, false);
+				                            false, true);
 
 				auto clipMask = SignMask(CmpGE(distance, SIMD::Float(0)));
 				for(auto ms = 0u; ms < state.multiSampleCount; ms++)
@@ -208,7 +213,7 @@ void PixelRoutine::quad(Pointer<Byte> cBuffer[RENDERTARGETS], Pointer<Byte> &zBu
 							routine.getVariable(it->second.Id)[it->second.FirstComponent + i] =
 							    interpolate(xxxx, DcullDistance[i], rhw,
 							                primitive + OFFSET(Primitive, cullDistance[i]),
-							                false, true, false);
+							                false, true);
 						}
 					}
 				}