Added new swizzle parameters to Sampler's state
The new parameters are: swizzleR, swizzleG, swizzleB, swizzleA.
Also, parameters sent from the context that can be either
originating from the Texture object or the Sampler object
are now sent from the correct origin.
An implementation for the swizzleR, swizzleG, swizzleB, swizzleA
parameters was done in SamplerCore. All related dEQP tests pass.
Change-Id: I45405a0d241d0e70a91a3c56357c7bc04c7dc75a
Reviewed-on: https://swiftshader-review.googlesource.com/4017
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/Renderer/PixelProcessor.cpp b/src/Renderer/PixelProcessor.cpp
index 858772a..0803291 100644
--- a/src/Renderer/PixelProcessor.cpp
+++ b/src/Renderer/PixelProcessor.cpp
@@ -416,6 +416,42 @@
else ASSERT(false);
}
+ void PixelProcessor::setSwizzleR(unsigned int sampler, SwizzleType swizzleR)
+ {
+ if(sampler < TEXTURE_IMAGE_UNITS)
+ {
+ context->sampler[sampler].setSwizzleR(swizzleR);
+ }
+ else ASSERT(false);
+ }
+
+ void PixelProcessor::setSwizzleG(unsigned int sampler, SwizzleType swizzleG)
+ {
+ if(sampler < TEXTURE_IMAGE_UNITS)
+ {
+ context->sampler[sampler].setSwizzleG(swizzleG);
+ }
+ else ASSERT(false);
+ }
+
+ void PixelProcessor::setSwizzleB(unsigned int sampler, SwizzleType swizzleB)
+ {
+ if(sampler < TEXTURE_IMAGE_UNITS)
+ {
+ context->sampler[sampler].setSwizzleB(swizzleB);
+ }
+ else ASSERT(false);
+ }
+
+ void PixelProcessor::setSwizzleA(unsigned int sampler, SwizzleType swizzleA)
+ {
+ if(sampler < TEXTURE_IMAGE_UNITS)
+ {
+ context->sampler[sampler].setSwizzleA(swizzleA);
+ }
+ else ASSERT(false);
+ }
+
void PixelProcessor::setWriteSRGB(bool sRGB)
{
context->setWriteSRGB(sRGB);