fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: track custom border color samplers and verify against device limits

Browse source 
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7487>
This commit is contained in:
Mike Blumenkrantz 2020-08-04 15:42:43 -04:00 • committed by Marge Bot
parent 4d498f5eac
commit 968e360e47
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/drivers/zink/zink_context.c
View file

@ -159,6 +159,11 @@ wrap_needs_border_color(unsigned wrap)
wrap == PIPE_TEX_WRAP_MIRROR_CLAMP || wrap == PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER; wrap == PIPE_TEX_WRAP_MIRROR_CLAMP || wrap == PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER;
} }
struct zink_sampler_state {
VkSampler sampler;
bool custom_border_color;
};
static void * static void *
zink_create_sampler_state(struct pipe_context *pctx, zink_create_sampler_state(struct pipe_context *pctx,
const struct pipe_sampler_state *state) const struct pipe_sampler_state *state)
@ -206,6 +211,8 @@ zink_create_sampler_state(struct pipe_context *pctx,
memcpy(&cbci.customBorderColor, &state->border_color, sizeof(union pipe_color_union)); memcpy(&cbci.customBorderColor, &state->border_color, sizeof(union pipe_color_union));
sci.pNext = &cbci; sci.pNext = &cbci;
sci.borderColor = VK_BORDER_COLOR_INT_CUSTOM_EXT; sci.borderColor = VK_BORDER_COLOR_INT_CUSTOM_EXT;
UNUSED uint32_t check = p_atomic_inc_return(&screen->cur_custom_border_color_samplers);
assert(check <= screen->info.border_color_props.maxCustomBorderColorSamplers);
} else } else
sci.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; // TODO with custom shader if we're super interested? sci.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; // TODO with custom shader if we're super interested?
sci.unnormalizedCoordinates = !state->normalized_coords; sci.unnormalizedCoordinates = !state->normalized_coords;
@ -215,11 +222,11 @@ zink_create_sampler_state(struct pipe_context *pctx,
sci.anisotropyEnable = VK_TRUE; sci.anisotropyEnable = VK_TRUE;
} }
VkSampler *sampler = CALLOC(1, sizeof(VkSampler)); struct zink_sampler_state *sampler = CALLOC(1, sizeof(struct zink_sampler_state));
if (!sampler) if (!sampler)
return NULL; return NULL;
if (vkCreateSampler(screen->dev, &sci, NULL, sampler) != VK_SUCCESS) { if (vkCreateSampler(screen->dev, &sci, NULL, &sampler->sampler) != VK_SUCCESS) {
FREE(sampler); FREE(sampler);
return NULL; return NULL;
} }
@ -247,10 +254,13 @@ static void
zink_delete_sampler_state(struct pipe_context *pctx, zink_delete_sampler_state(struct pipe_context *pctx,
void *sampler_state) void *sampler_state)
{ {
struct zink_sampler_state *sampler = sampler_state;
struct zink_batch *batch = zink_curr_batch(zink_context(pctx)); struct zink_batch *batch = zink_curr_batch(zink_context(pctx));
util_dynarray_append(&batch->zombie_samplers, VkSampler, util_dynarray_append(&batch->zombie_samplers, VkSampler,
*(VkSampler *)sampler_state); sampler->sampler);
FREE(sampler_state); if (sampler->custom_border_color)
p_atomic_dec(&zink_screen(pctx->screen)->cur_custom_border_color_samplers);
FREE(sampler);
} }

3
src/gallium/drivers/zink/zink_screen.h
View file

@ -66,8 +66,11 @@ struct zink_screen {
VkDevice dev; VkDevice dev;
VkDebugUtilsMessengerEXT debugUtilsCallbackHandle; VkDebugUtilsMessengerEXT debugUtilsCallbackHandle;
uint32_t cur_custom_border_color_samplers;
uint32_t loader_version; uint32_t loader_version;
bool have_physical_device_prop2_ext; bool have_physical_device_prop2_ext;
bool have_debug_utils_ext; bool have_debug_utils_ext;
bool needs_mesa_wsi; bool needs_mesa_wsi;