Module: Mesa Branch: main Commit: 2170c3ac63079a99864a29e2c23207e61a30278f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2170c3ac63079a99864a29e2c23207e61a30278f
Author: Jason Ekstrand <[email protected]> Date: Sat Mar 12 11:01:12 2022 -0600 panvk: Use the correct integer border colors Reviewed-by: Boris Brezillon <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15382> --- src/panfrost/ci/deqp-panfrost-g52-vk.toml | 1 + src/panfrost/vulkan/panvk_vX_cs.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/panfrost/ci/deqp-panfrost-g52-vk.toml b/src/panfrost/ci/deqp-panfrost-g52-vk.toml index 897667a5e2a..fbafaf8daef 100644 --- a/src/panfrost/ci/deqp-panfrost-g52-vk.toml +++ b/src/panfrost/ci/deqp-panfrost-g52-vk.toml @@ -11,5 +11,6 @@ include = [ "dEQP-VK.glsl.builtin.precision.frexp.*", "dEQP-VK.glsl.builtin.precision.ldexp.*", "dEQP-VK.image.load_store.with_format.*", + "dEQP-VK.pipeline.sampler.view_type.*.format.r*.address_modes.all_mode_clamp_to_border*", "dEQP-VK.ssbo.layout.single_basic_type.*", ] diff --git a/src/panfrost/vulkan/panvk_vX_cs.c b/src/panfrost/vulkan/panvk_vX_cs.c index caabb217fc8..d537510cdeb 100644 --- a/src/panfrost/vulkan/panvk_vX_cs.c +++ b/src/panfrost/vulkan/panvk_vX_cs.c @@ -80,13 +80,13 @@ panvk_translate_sampler_border_color(const VkSamplerCreateInfo *pCreateInfo, border_color[0] = border_color[1] = border_color[2] = 0; border_color[3] = pCreateInfo->borderColor == VK_BORDER_COLOR_INT_OPAQUE_BLACK ? - UINT_MAX : 0; + 1 : 0; break; case VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE: border_color[0] = border_color[1] = border_color[2] = border_color[3] = fui(1.0); break; case VK_BORDER_COLOR_INT_OPAQUE_WHITE: - border_color[0] = border_color[1] = border_color[2] = border_color[3] = UINT_MAX; + border_color[0] = border_color[1] = border_color[2] = border_color[3] = 1; break; case VK_BORDER_COLOR_FLOAT_CUSTOM_EXT: case VK_BORDER_COLOR_INT_CUSTOM_EXT:
