Rename multiSampledBresenham to enableMultiSampling
The pipeline code doesn't need to know whether we're drawing Bresenham
lines or anything else. It just needs to know whether or not to enable
multisample rasterization for a multisample render target.
Also rename multiSample to multiSampleCount.
Bug: b/142965928
Change-Id: I34395e90d502c49cd13e0087d4b323d222cb2064
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/40169
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Device/PixelProcessor.cpp b/src/Device/PixelProcessor.cpp
index 91644a1..cba29ae 100644
--- a/src/Device/PixelProcessor.cpp
+++ b/src/Device/PixelProcessor.cpp
@@ -133,12 +133,12 @@
state.blendState[i] = context->getBlendState(i);
}
- state.multiSample = static_cast<unsigned int>(context->sampleCount);
+ state.multiSampleCount = static_cast<unsigned int>(context->sampleCount);
state.multiSampleMask = context->multiSampleMask;
- state.multiSampledBresenham = (state.multiSample > 1) && context->isDrawLine(true) &&
- (context->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT);
+ state.enableMultiSampling = (state.multiSampleCount > 1) &&
+ !(context->isDrawLine(true) && (context->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT));
- if(state.multiSample > 1 && context->pixelShader)
+ if(state.multiSampleCount > 1 && context->pixelShader)
{
state.centroid = context->pixelShader->getModes().NeedsCentroid;
}
diff --git a/src/Device/PixelProcessor.hpp b/src/Device/PixelProcessor.hpp
index 4679b16..939ad98 100644
--- a/src/Device/PixelProcessor.hpp
+++ b/src/Device/PixelProcessor.hpp
@@ -84,9 +84,9 @@
unsigned int colorWriteMask;
VkFormat targetFormat[RENDERTARGETS];
- unsigned int multiSample;
+ unsigned int multiSampleCount;
unsigned int multiSampleMask;
- bool multiSampledBresenham;
+ bool enableMultiSampling;
bool alphaToCoverage;
bool centroid;
VkFrontFace frontFace;
diff --git a/src/Device/QuadRasterizer.cpp b/src/Device/QuadRasterizer.cpp
index 36db635..b652b59 100644
--- a/src/Device/QuadRasterizer.cpp
+++ b/src/Device/QuadRasterizer.cpp
@@ -52,7 +52,7 @@
rasterize(yMin, yMax);
}
- primitive += sizeof(Primitive) * state.multiSample;
+ primitive += sizeof(Primitive) * state.multiSampleCount;
count--;
}
Until(count == 0);
@@ -101,7 +101,7 @@
Int x0b = Int(*Pointer<Short>(primitive + OFFSET(Primitive, outline->left) + (y + 1) * sizeof(Primitive::Span)));
Int x0 = Min(x0a, x0b);
- for(unsigned int q = 1; q < state.multiSample; q++)
+ for(unsigned int q = 1; q < state.multiSampleCount; q++)
{
x0a = Int(*Pointer<Short>(primitive + q * sizeof(Primitive) + OFFSET(Primitive, outline->left) + (y + 0) * sizeof(Primitive::Span)));
x0b = Int(*Pointer<Short>(primitive + q * sizeof(Primitive) + OFFSET(Primitive, outline->left) + (y + 1) * sizeof(Primitive::Span)));
@@ -114,7 +114,7 @@
Int x1b = Int(*Pointer<Short>(primitive + OFFSET(Primitive, outline->right) + (y + 1) * sizeof(Primitive::Span)));
Int x1 = Max(x1a, x1b);
- for(unsigned int q = 1; q < state.multiSample; q++)
+ for(unsigned int q = 1; q < state.multiSampleCount; q++)
{
x1a = Int(*Pointer<Short>(primitive + q * sizeof(Primitive) + OFFSET(Primitive, outline->right) + (y + 0) * sizeof(Primitive::Span)));
x1b = Int(*Pointer<Short>(primitive + q * sizeof(Primitive) + OFFSET(Primitive, outline->right) + (y + 1) * sizeof(Primitive::Span)));
@@ -125,11 +125,11 @@
if(interpolateZ())
{
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
Float4 y = yyyy;
- if(state.multiSample > 1)
+ if(state.multiSampleCount > 1)
{
y -= *Pointer<Float4>(constants + OFFSET(Constants, Y) + q * sizeof(float4));
}
@@ -176,7 +176,7 @@
Short4 xLeft[4];
Short4 xRight[4];
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
xLeft[q] = *Pointer<Short4>(primitive + q * sizeof(Primitive) + OFFSET(Primitive, outline) + y * sizeof(Primitive::Span));
xRight[q] = xLeft[q];
@@ -190,11 +190,11 @@
Short4 xxxx = Short4(x);
Int cMask[4];
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
if(state.multiSampleMask & (1 << q))
{
- unsigned int i = state.multiSampledBresenham ? 0 : q;
+ unsigned int i = state.enableMultiSampling ? q : 0;
Short4 mask = CmpGT(xxxx, xLeft[i]) & CmpGT(xRight[i], xxxx);
cMask[q] = SignMask(PackSigned(mask, mask)) & 0x0000000F;
}
diff --git a/src/Device/Renderer.cpp b/src/Device/Renderer.cpp
index 966d9e5..d94d0ba 100644
--- a/src/Device/Renderer.cpp
+++ b/src/Device/Renderer.cpp
@@ -617,7 +617,7 @@
{
auto &state = drawCall->setupState;
- int ms = state.multiSample;
+ int ms = state.multiSampleCount;
const DrawData *data = drawCall->data;
int visible = 0;
@@ -662,7 +662,7 @@
{
auto &state = drawCall->setupState;
- int ms = state.multiSample;
+ int ms = state.multiSampleCount;
int visible = 0;
for(int i = 0; i < count; i++)
@@ -710,7 +710,7 @@
{
auto &state = drawCall->setupState;
- int ms = state.multiSample;
+ int ms = state.multiSampleCount;
int visible = 0;
for(int i = 0; i < count; i++)
@@ -756,7 +756,7 @@
auto &state = drawCall->setupState;
int visible = 0;
- int ms = state.multiSample;
+ int ms = state.multiSampleCount;
for(int i = 0; i < count; i++)
{
@@ -777,7 +777,7 @@
auto &state = drawCall->setupState;
int visible = 0;
- int ms = state.multiSample;
+ int ms = state.multiSampleCount;
for(int i = 0; i < count; i++)
{
diff --git a/src/Device/SetupProcessor.cpp b/src/Device/SetupProcessor.cpp
index 2271cb8..f9b2ca3 100644
--- a/src/Device/SetupProcessor.cpp
+++ b/src/Device/SetupProcessor.cpp
@@ -78,7 +78,7 @@
state.frontFace = context->frontFace;
state.cullMode = context->cullMode;
- state.multiSample = context->sampleCount;
+ state.multiSampleCount = context->sampleCount;
state.rasterizerDiscard = context->rasterizerDiscard;
state.numClipDistances = context->vertexShader->getNumOutputClipDistances();
diff --git a/src/Device/SetupProcessor.hpp b/src/Device/SetupProcessor.hpp
index e418bc9..c583c27 100644
--- a/src/Device/SetupProcessor.hpp
+++ b/src/Device/SetupProcessor.hpp
@@ -51,7 +51,7 @@
bool interpolateW : 1;
VkFrontFace frontFace : BITS(VK_FRONT_FACE_MAX_ENUM);
VkCullModeFlags cullMode : BITS(VK_CULL_MODE_FLAG_BITS_MAX_ENUM);
- unsigned int multiSample : 3; // 1, 2 or 4
+ unsigned int multiSampleCount : 3; // 1, 2 or 4
bool rasterizerDiscard : 1;
unsigned int numClipDistances : 4; // [0 - 8]
unsigned int numCullDistances : 4; // [0 - 8]
diff --git a/src/Pipeline/PixelProgram.cpp b/src/Pipeline/PixelProgram.cpp
index 7782f20..7fd52fa 100644
--- a/src/Pipeline/PixelProgram.cpp
+++ b/src/Pipeline/PixelProgram.cpp
@@ -25,7 +25,7 @@
{
// See if at least 1 sample is used
Int maskUnion = cMask[0];
- for(auto i = 1u; i < state.multiSample; i++)
+ for(auto i = 1u; i < state.multiSampleCount; i++)
{
maskUnion |= cMask[i];
}
@@ -43,7 +43,7 @@
{
// See if at least 1 sample is used
Int maskUnion = cMask[0] & sMask[0] & zMask[0];
- for(auto i = 1u; i < state.multiSample; i++)
+ for(auto i = 1u; i < state.multiSampleCount; i++)
{
maskUnion |= (cMask[i] & sMask[i] & zMask[i]);
}
@@ -130,7 +130,7 @@
Int4 laneBits = Int4(1, 2, 4, 8);
Int4 inputSampleMask = Int4(1) & CmpNEQ(Int4(cMask[0]) & laneBits, Int4(0));
- for(auto i = 1u; i < state.multiSample; i++)
+ for(auto i = 1u; i < state.multiSampleCount; i++)
{
inputSampleMask |= Int4(1 << i) & CmpNEQ(Int4(cMask[i]) & laneBits, Int4(0));
}
@@ -163,7 +163,7 @@
if(spirvShader->getModes().ContainsKill)
{
- for(auto i = 0u; i < state.multiSample; i++)
+ for(auto i = 0u; i < state.multiSampleCount; i++)
{
cMask[i] &= ~routine.killMask;
}
@@ -174,7 +174,7 @@
{
auto outputSampleMask = As<SIMD::Int>(routine.getVariable(it->second.Id)[it->second.FirstComponent]);
- for(auto i = 0u; i < state.multiSample; i++)
+ for(auto i = 0u; i < state.multiSampleCount; i++)
{
cMask[i] &= SignMask(CmpNEQ(outputSampleMask & SIMD::Int(1 << i), SIMD::Int(0)));
}
@@ -198,7 +198,7 @@
Int pass = cMask[0];
- for(unsigned int q = 1; q < state.multiSample; q++)
+ for(unsigned int q = 1; q < state.multiSampleCount; q++)
{
pass = pass | cMask[q];
}
@@ -232,7 +232,7 @@
case VK_FORMAT_A8B8G8R8_SRGB_PACK32:
case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
if(state.multiSampleMask & (1 << q))
{
@@ -278,7 +278,7 @@
case VK_FORMAT_A8B8G8R8_SINT_PACK32:
case VK_FORMAT_A2B10G10R10_UINT_PACK32:
case VK_FORMAT_A2R10G10B10_UINT_PACK32:
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
if(state.multiSampleMask & (1 << q))
{
diff --git a/src/Pipeline/PixelRoutine.cpp b/src/Pipeline/PixelRoutine.cpp
index 4aa7f03..c36f8a4 100644
--- a/src/Pipeline/PixelRoutine.cpp
+++ b/src/Pipeline/PixelRoutine.cpp
@@ -58,13 +58,13 @@
Int zMask[4]; // Depth mask
Int sMask[4]; // Stencil mask
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
zMask[q] = cMask[q];
sMask[q] = cMask[q];
}
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
stencilTest(sBuffer, q, x, sMask[q], cMask[q]);
}
@@ -76,11 +76,11 @@
if(interpolateZ())
{
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
Float4 x = xxxx;
- if(state.multiSample > 1)
+ if(state.multiSampleCount > 1)
{
x -= *Pointer<Float4>(constants + OFFSET(Constants, X) + q * sizeof(float4));
}
@@ -93,7 +93,7 @@
if(earlyDepthTest)
{
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
depthPass = depthPass || depthTest(zBuffer, q, x, z[q], sMask[q], zMask[q], cMask[q]);
}
@@ -111,7 +111,7 @@
{
Float4 WWWW(1.0e-9f);
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
XXXX += *Pointer<Float4>(constants + OFFSET(Constants, sampleX[q]) + 16 * cMask[q]);
YYYY += *Pointer<Float4>(constants + OFFSET(Constants, sampleY[q]) + 16 * cMask[q]);
@@ -144,7 +144,7 @@
auto const &input = spirvShader->inputs[interpolant];
if(input.Type != SpirvShader::ATTRIBTYPE_UNUSED)
{
- if(input.Centroid && state.multiSample > 1)
+ if(input.Centroid && state.multiSampleCount > 1)
{
routine.inputs[interpolant] =
interpolateCentroid(XXXX, YYYY, rhwCentroid,
@@ -170,7 +170,7 @@
false, true, false);
auto clipMask = SignMask(CmpGE(distance, SIMD::Float(0)));
- for(auto ms = 0u; ms < state.multiSample; ms++)
+ for(auto ms = 0u; ms < state.multiSampleCount; ms++)
{
// TODO: Fragments discarded by clipping do not exist at
// all -- they should not be counted in queries or have
@@ -223,7 +223,7 @@
if((spirvShader && spirvShader->getModes().ContainsKill) || state.alphaToCoverage)
{
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
zMask[q] &= cMask[q];
sMask[q] &= cMask[q];
@@ -234,7 +234,7 @@
{
if(!earlyDepthTest)
{
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
depthPass = depthPass || depthTest(zBuffer, q, x, z[q], sMask[q], zMask[q], cMask[q]);
}
@@ -242,7 +242,7 @@
If(depthPass || Bool(earlyDepthTest))
{
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
if(state.multiSampleMask & (1 << q))
{
@@ -260,7 +260,7 @@
}
}
- for(unsigned int q = 0; q < state.multiSample; q++)
+ for(unsigned int q = 0; q < state.multiSampleCount; q++)
{
if(state.multiSampleMask & (1 << q))
{
diff --git a/src/Pipeline/SetupRoutine.cpp b/src/Pipeline/SetupRoutine.cpp
index 06dea29..9c86104 100644
--- a/src/Pipeline/SetupRoutine.cpp
+++ b/src/Pipeline/SetupRoutine.cpp
@@ -166,7 +166,7 @@
constexpr int subPixM = vk::SUBPIXEL_PRECISION_MASK;
constexpr float subPixF = vk::SUBPIXEL_PRECISION_FACTOR;
- if(state.multiSample > 1)
+ if(state.multiSampleCount > 1)
{
yMin = (yMin + Constants::yMinMultiSampleOffset) >> subPixB;
yMax = (yMax + Constants::yMaxMultiSampleOffset) >> subPixB;
@@ -188,7 +188,7 @@
Return(0);
}
- For(Int q = 0, q < state.multiSample, q++)
+ For(Int q = 0, q < state.multiSampleCount, q++)
{
Array<Int> Xq(16);
Array<Int> Yq(16);
@@ -200,7 +200,7 @@
Xq[i] = X[i];
Yq[i] = Y[i];
- if(state.multiSample > 1)
+ if(state.multiSampleCount > 1)
{
Xq[i] = Xq[i] + *Pointer<Int>(constants + OFFSET(Constants, Xf) + q * sizeof(int));
Yq[i] = Yq[i] + *Pointer<Int>(constants + OFFSET(Constants, Yf) + q * sizeof(int));
@@ -213,7 +213,7 @@
Pointer<Byte> leftEdge = Pointer<Byte>(primitive + OFFSET(Primitive, outline->left)) + q * sizeof(Primitive);
Pointer<Byte> rightEdge = Pointer<Byte>(primitive + OFFSET(Primitive, outline->right)) + q * sizeof(Primitive);
- if(state.multiSample > 1)
+ if(state.multiSampleCount > 1)
{
Int xMin = *Pointer<Int>(data + OFFSET(DrawData, scissorX0));
Int xMax = *Pointer<Int>(data + OFFSET(DrawData, scissorX1));
@@ -242,7 +242,7 @@
Until(i >= n);
}
- if(state.multiSample == 1)
+ if(state.multiSampleCount == 1)
{
For(, yMin < yMax && *Pointer<Short>(leftEdge + yMin * sizeof(Primitive::Span)) == *Pointer<Short>(rightEdge + yMin * sizeof(Primitive::Span)), yMin++)
{
