Rename rasterOperation() to blendColor()
rasterOperation was derived from ROP, but that acronym now stands for
'render output unit', and is also understood to include depth value
handling, while our function only performs color blending and writing.
Note that VkPipelineColorBlendAttachmentState also includes the write
mask, so the color blending can be interpreted as also including the
write operation.
Our actual blend operation, without the write, happens in alphaBlend(),
which could be confused for being just the blending of the color's alpha
component, but this is kept as-is for now.
Bug: b/134584057
Change-Id: Ia195c2638effde6a2a025208b90f29dddaf381e3
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/57288
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Sean Risser <srisser@google.com>
diff --git a/src/Pipeline/PixelProgram.cpp b/src/Pipeline/PixelProgram.cpp
index 60e6805..e454c95 100644
--- a/src/Pipeline/PixelProgram.cpp
+++ b/src/Pipeline/PixelProgram.cpp
@@ -267,7 +267,7 @@
return pass != 0x0;
}
-void PixelProgram::rasterOperation(Pointer<Byte> cBuffer[4], Int &x, Int sMask[4], Int zMask[4], Int cMask[4], const SampleSet &samples)
+void PixelProgram::blendColor(Pointer<Byte> cBuffer[4], Int &x, Int sMask[4], Int zMask[4], Int cMask[4], const SampleSet &samples)
{
for(int index = 0; index < MAX_COLOR_BUFFERS; index++)
{
diff --git a/src/Pipeline/PixelProgram.hpp b/src/Pipeline/PixelProgram.hpp
index dfdd1f1..da26c8a 100644
--- a/src/Pipeline/PixelProgram.hpp
+++ b/src/Pipeline/PixelProgram.hpp
@@ -34,7 +34,7 @@
virtual void setBuiltins(Int &x, Int &y, Float4 (&z)[4], Float4 &w, Int cMask[4], const SampleSet &samples);
virtual void executeShader(Int cMask[4], Int sMask[4], Int zMask[4], const SampleSet &samples);
virtual Bool alphaTest(Int cMask[4], const SampleSet &samples);
- virtual void rasterOperation(Pointer<Byte> cBuffer[4], Int &x, Int sMask[4], Int zMask[4], Int cMask[4], const SampleSet &samples);
+ virtual void blendColor(Pointer<Byte> cBuffer[4], Int &x, Int sMask[4], Int zMask[4], Int cMask[4], const SampleSet &samples);
private:
// Color outputs
diff --git a/src/Pipeline/PixelRoutine.cpp b/src/Pipeline/PixelRoutine.cpp
index 46af146..4166ea1 100644
--- a/src/Pipeline/PixelRoutine.cpp
+++ b/src/Pipeline/PixelRoutine.cpp
@@ -320,7 +320,7 @@
writeDepth(zBuffer, x, zMask, samples);
}
- rasterOperation(cBuffer, x, sMask, zMask, cMask, samples);
+ blendColor(cBuffer, x, sMask, zMask, cMask, samples);
occlusionSampleCount(zMask, sMask, samples);
}
diff --git a/src/Pipeline/PixelRoutine.hpp b/src/Pipeline/PixelRoutine.hpp
index f1d618d..a3c731b 100644
--- a/src/Pipeline/PixelRoutine.hpp
+++ b/src/Pipeline/PixelRoutine.hpp
@@ -49,7 +49,7 @@
virtual void setBuiltins(Int &x, Int &y, Float4 (&z)[4], Float4 &w, Int cMask[4], const SampleSet &samples) = 0;
virtual void executeShader(Int cMask[4], Int sMask[4], Int zMask[4], const SampleSet &samples) = 0;
virtual Bool alphaTest(Int cMask[4], const SampleSet &samples) = 0;
- virtual void rasterOperation(Pointer<Byte> cBuffer[4], Int &x, Int sMask[4], Int zMask[4], Int cMask[4], const SampleSet &samples) = 0;
+ virtual void blendColor(Pointer<Byte> cBuffer[4], Int &x, Int sMask[4], Int zMask[4], Int cMask[4], const SampleSet &samples) = 0;
void quad(Pointer<Byte> cBuffer[4], Pointer<Byte> &zBuffer, Pointer<Byte> &sBuffer, Int cMask[4], Int &x, Int &y) override;
