Refactor texture coordinate addressing.
Unify address() and addressW() by introducing a new addressing mode.
Change-Id: I09f9cbbe7800cfd5ef737322d680327aeddd27f1
Reviewed-on: https://swiftshader-review.googlesource.com/4714
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/Renderer/Sampler.cpp b/src/Renderer/Sampler.cpp
index aaf6a49..8a60d95 100644
--- a/src/Renderer/Sampler.cpp
+++ b/src/Renderer/Sampler.cpp
@@ -42,7 +42,7 @@
memset(&mipmap, 0, sizeof(Mipmap));
- for(int face = 0; face < 6; face++)
+ for(int face = 0; face < 6; face++)
{
mipmap.buffer[face] = &zero;
}
@@ -316,7 +316,7 @@
{
this->swizzleR = swizzleR;
}
-
+
void Sampler::setSwizzleG(SwizzleType swizzleG)
{
this->swizzleG = swizzleG;
@@ -457,6 +457,11 @@
return ADDRESSING_CLAMP;
}
+ if(textureType == TEXTURE_2D_ARRAY || textureType == TEXTURE_2D)
+ {
+ return ADDRESSING_LAYER;
+ }
+
return addressingModeW;
}
}
