Use {MIN,MAX}_TEXEL_OFFSET in device limits
Change-Id: I8c631f3b956d206cc1377c1d38c93f418afc20fd
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/34988
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
diff --git a/src/Device/Config.hpp b/src/Device/Config.hpp
index 3203c14..45a04e6 100644
--- a/src/Device/Config.hpp
+++ b/src/Device/Config.hpp
@@ -53,8 +53,8 @@
MAX_CLIP_PLANES = 6,
MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 64,
MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 64,
- MIN_PROGRAM_TEXEL_OFFSET = -8,
- MAX_PROGRAM_TEXEL_OFFSET = 7,
+ MIN_TEXEL_OFFSET = -8,
+ MAX_TEXEL_OFFSET = 7,
MAX_TEXTURE_LOD = MIPMAP_LEVELS - 2, // Trilinear accesses lod+1
RENDERTARGETS = 8,
MAX_INTERFACE_COMPONENTS = 16 * 4, // Must be multiple of 4 for 16-byte alignment.
diff --git a/src/Pipeline/SamplerCore.cpp b/src/Pipeline/SamplerCore.cpp
index 3c2dc9a..055d9ff 100644
--- a/src/Pipeline/SamplerCore.cpp
+++ b/src/Pipeline/SamplerCore.cpp
@@ -1242,7 +1242,7 @@
switch(mode)
{
case AddressingMode::ADDRESSING_WRAP:
- tmp = (tmp + whd * Int4(-MIN_PROGRAM_TEXEL_OFFSET)) % whd;
+ tmp = (tmp + whd * Int4(-MIN_TEXEL_OFFSET)) % whd;
break;
case AddressingMode::ADDRESSING_CLAMP:
case AddressingMode::ADDRESSING_MIRROR:
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 14476a5..d721c94 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -215,10 +215,10 @@
vk::MIN_TEXEL_BUFFER_OFFSET_ALIGNMENT, // minTexelBufferOffsetAlignment
vk::MIN_UNIFORM_BUFFER_OFFSET_ALIGNMENT, // minUniformBufferOffsetAlignment
vk::MIN_STORAGE_BUFFER_OFFSET_ALIGNMENT, // minStorageBufferOffsetAlignment
- -8, // minTexelOffset
- 7, // maxTexelOffset
- -8, // minTexelGatherOffset
- 7, // maxTexelGatherOffset
+ sw::MIN_TEXEL_OFFSET, // minTexelOffset
+ sw::MAX_TEXEL_OFFSET, // maxTexelOffset
+ sw::MIN_TEXEL_OFFSET, // minTexelGatherOffset
+ sw::MAX_TEXEL_OFFSET, // maxTexelGatherOffset
-0.5, // minInterpolationOffset
0.5, // maxInterpolationOffset
4, // subPixelInterpolationOffsetBits
