Rename pixel coordinate variables
Bug: b/237494823
Change-Id: Ib475c834eaecbd846183e53057e2e5dd8544913a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/67588
Reviewed-by: Sean Risser <srisser@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Device/QuadRasterizer.cpp b/src/Device/QuadRasterizer.cpp
index 778454e..9fccec8 100644
--- a/src/Device/QuadRasterizer.cpp
+++ b/src/Device/QuadRasterizer.cpp
@@ -122,13 +122,13 @@
x1 = Max(x1, Max(x1a, x1b));
}
- yyyy = SIMD::Float(Float(y)) + SIMD::Float(*Pointer<Float4>(primitive + OFFSET(Primitive, yQuad), 16));
+ yFragment = SIMD::Float(Float(y)) + SIMD::Float(*Pointer<Float4>(primitive + OFFSET(Primitive, yQuad), 16));
if(interpolateZ())
{
for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
- SIMD::Float y = yyyy;
+ SIMD::Float y = yFragment;
if(state.enableMultiSampling)
{
@@ -143,7 +143,7 @@
{
if(interpolateW())
{
- Dw = SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, w.C))) + yyyy * SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, w.B)));
+ Dw = SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, w.C))) + yFragment * SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, w.B)));
}
if(spirvShader)
@@ -157,7 +157,7 @@
if(!spirvShader->inputs[interfaceInterpolant].Flat)
{
Dv[interfaceInterpolant] +=
- yyyy * SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, V[packedInterpolant].B)));
+ yFragment * SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, V[packedInterpolant].B)));
}
packedInterpolant++;
}
@@ -166,13 +166,13 @@
for(unsigned int i = 0; i < state.numClipDistances; i++)
{
DclipDistance[i] = SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, clipDistance[i].C))) +
- yyyy * SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, clipDistance[i].B)));
+ yFragment * SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, clipDistance[i].B)));
}
for(unsigned int i = 0; i < state.numCullDistances; i++)
{
DcullDistance[i] = SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, cullDistance[i].C))) +
- yyyy * SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, cullDistance[i].B)));
+ yFragment * SIMD::Float(*Pointer<Float>(primitive + OFFSET(Primitive, cullDistance[i].B)));
}
}
diff --git a/src/Device/QuadRasterizer.hpp b/src/Device/QuadRasterizer.hpp
index 8ae7df9..8d9e24b 100644
--- a/src/Device/QuadRasterizer.hpp
+++ b/src/Device/QuadRasterizer.hpp
@@ -34,8 +34,9 @@
Pointer<Byte> constants;
// Fragment coordinates relative to the polygon's origin
- SIMD::Float xxxx;
- SIMD::Float yyyy;
+ // TODO(b/236162233): Use SIMD::Float2
+ SIMD::Float xFragment;
+ SIMD::Float yFragment;
// B * y + C term of interpolants plane equations
SIMD::Float Dz[4];
diff --git a/src/Pipeline/PixelRoutine.cpp b/src/Pipeline/PixelRoutine.cpp
index 14aa0c3..687e69d 100644
--- a/src/Pipeline/PixelRoutine.cpp
+++ b/src/Pipeline/PixelRoutine.cpp
@@ -94,13 +94,13 @@
SIMD::Float rhwCentroid;
- xxxx = Float4(Float(x)) + *Pointer<Float4>(primitive + OFFSET(Primitive, xQuad), 16);
+ xFragment = Float4(Float(x)) + *Pointer<Float4>(primitive + OFFSET(Primitive, xQuad), 16);
if(interpolateZ())
{
for(unsigned int q : samples)
{
- SIMD::Float x = xxxx;
+ SIMD::Float x = xFragment;
if(state.enableMultiSampling)
{
@@ -140,38 +140,38 @@
occlusionSampleCount(zMask, sMask, samples);
}
- // Centroid locations
- SIMD::Float XXXX = 0.0f;
- SIMD::Float YYYY = 0.0f;
+ // TODO(b/236162233): Use SIMD::Float2
+ SIMD::Float xCentroid = 0.0f;
+ SIMD::Float yCentroid = 0.0f;
if(state.centroid || shaderContainsInterpolation) // TODO(b/194714095)
{
- SIMD::Float WWWW = 1.0e-9f;
+ SIMD::Float weight = 1.0e-9f;
for(unsigned int q : samples)
{
ASSERT(SIMD::Width == 4);
- XXXX += SIMD::Float(*Pointer<Float4>(constants + OFFSET(Constants, sampleX[q]) + 16 * cMask[q]));
- YYYY += SIMD::Float(*Pointer<Float4>(constants + OFFSET(Constants, sampleY[q]) + 16 * cMask[q]));
- WWWW += SIMD::Float(*Pointer<Float4>(constants + OFFSET(Constants, weight) + 16 * cMask[q]));
+ xCentroid += SIMD::Float(*Pointer<Float4>(constants + OFFSET(Constants, sampleX[q]) + 16 * cMask[q]));
+ yCentroid += SIMD::Float(*Pointer<Float4>(constants + OFFSET(Constants, sampleY[q]) + 16 * cMask[q]));
+ weight += SIMD::Float(*Pointer<Float4>(constants + OFFSET(Constants, weight) + 16 * cMask[q]));
}
- WWWW = Rcp(WWWW, true /* relaxedPrecision */);
- XXXX *= WWWW;
- YYYY *= WWWW;
+ weight = Rcp(weight, true /* relaxedPrecision */);
+ xCentroid *= weight;
+ yCentroid *= weight;
- XXXX += xxxx;
- YYYY += yyyy;
+ xCentroid += xFragment;
+ yCentroid += yFragment;
}
if(interpolateW())
{
- w = interpolate(xxxx, Dw, rhw, primitive + OFFSET(Primitive, w), false, false);
+ w = interpolate(xFragment, Dw, rhw, primitive + OFFSET(Primitive, w), false, false);
rhw = reciprocal(w, false, true);
if(state.centroid || shaderContainsInterpolation) // TODO(b/194714095)
{
- rhwCentroid = reciprocal(SpirvRoutine::interpolateAtXY(XXXX, YYYY, rhwCentroid, primitive + OFFSET(Primitive, w), SpirvRoutine::Linear));
+ rhwCentroid = reciprocal(SpirvRoutine::interpolateAtXY(xCentroid, yCentroid, rhwCentroid, primitive + OFFSET(Primitive, w), SpirvRoutine::Linear));
}
}
@@ -181,17 +181,17 @@
{
routine.interpolationData.primitive = primitive;
- routine.interpolationData.x = xxxx;
- routine.interpolationData.y = yyyy;
+ routine.interpolationData.x = xFragment;
+ routine.interpolationData.y = yFragment;
routine.interpolationData.rhw = rhw;
- routine.interpolationData.xCentroid = XXXX;
- routine.interpolationData.yCentroid = YYYY;
+ routine.interpolationData.xCentroid = xCentroid;
+ routine.interpolationData.yCentroid = yCentroid;
routine.interpolationData.rhwCentroid = rhwCentroid;
}
- SIMD::Float xSample = xxxx;
- SIMD::Float ySample = yyyy;
+ SIMD::Float xSample = xFragment;
+ SIMD::Float ySample = yFragment;
if(perSampleShading && (state.multiSampleCount > 1))
{
@@ -209,7 +209,7 @@
if(input.Centroid && state.enableMultiSampling)
{
routine.inputs[interfaceInterpolant] =
- SpirvRoutine::interpolateAtXY(XXXX, YYYY, rhwCentroid,
+ SpirvRoutine::interpolateAtXY(xCentroid, yCentroid, rhwCentroid,
primitive + OFFSET(Primitive, V[packedInterpolant]),
routine.inputsInterpolation[packedInterpolant]);
}
@@ -223,7 +223,7 @@
else
{
routine.inputs[interfaceInterpolant] =
- interpolate(xxxx, Dv[interfaceInterpolant], rhw,
+ interpolate(xFragment, Dv[interfaceInterpolant], rhw,
primitive + OFFSET(Primitive, V[packedInterpolant]),
input.Flat, !input.NoPerspective);
}
@@ -235,7 +235,7 @@
for(uint32_t i = 0; i < state.numClipDistances; i++)
{
- auto distance = interpolate(xxxx, DclipDistance[i], rhw,
+ auto distance = interpolate(xFragment, DclipDistance[i], rhw,
primitive + OFFSET(Primitive, clipDistance[i]),
false, true);
@@ -271,7 +271,7 @@
if(i < it->second.SizeInComponents)
{
routine.getVariable(it->second.Id)[it->second.FirstComponent + i] =
- interpolate(xxxx, DcullDistance[i], rhw,
+ interpolate(xFragment, DcullDistance[i], rhw,
primitive + OFFSET(Primitive, cullDistance[i]),
false, true);
}
