From 0fc146e7da4885684751ef62444ba653712574f9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 27 Jan 2021 23:40:40 -0500 Subject: [PATCH] zink: enable GL_CLAMP cap Reviewed-by: Eric Anholt Part-of: --- src/gallium/drivers/zink/zink_context.c | 3 +-- src/gallium/drivers/zink/zink_screen.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index e5b6ba5..7f1f790 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -148,13 +148,12 @@ sampler_address_mode(enum pipe_tex_wrap filter) { switch (filter) { case PIPE_TEX_WRAP_REPEAT: return VK_SAMPLER_ADDRESS_MODE_REPEAT; - case PIPE_TEX_WRAP_CLAMP: return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; /* not technically correct, but kinda works */ case PIPE_TEX_WRAP_CLAMP_TO_EDGE: return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; case PIPE_TEX_WRAP_CLAMP_TO_BORDER: return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; case PIPE_TEX_WRAP_MIRROR_REPEAT: return VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT; - case PIPE_TEX_WRAP_MIRROR_CLAMP: return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; /* not technically correct, but kinda works */ case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE: return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER: return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; /* not technically correct, but kinda works */ + default: break; } unreachable("unexpected wrap"); } diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index f85ba1c..f7add46 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -270,6 +270,9 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TEXTURE_SWIZZLE: return 1; + case PIPE_CAP_GL_CLAMP: + return 0; + case PIPE_CAP_MAX_TEXTURE_2D_SIZE: return screen->info.props.limits.maxImageDimension2D; case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: -- 2.7.4