AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: heap-allocate samplers objects

Browse Source 
VkSampler is 64-bit even on 32-bit systems, so casting it to a pointer
is a bad idea there. So let's heap-allocate the sampler-object instead.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2017
Reviewed-by: Witold Baryluk <witold.baryluk@gmail.com>
Tested-by: Witold Baryluk <witold.baryluk@gmail.com>
This commit is contained in:
Erik Faye-Lund
2019-10-29 10:07:53 +01:00
parent 0ca0ad1252
commit 5ea787950f
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_context.c
+14 -7
View File
@@ -162,11 +162,15 @@ zink_create_sampler_state(struct pipe_context *pctx,
sci.anisotropyEnable = VK_TRUE;
}
VkSampler sampler;
VkResult err = vkCreateSampler(screen->dev, &sci, NULL, &sampler);
if (err != VK_SUCCESS)
VkSampler *sampler = CALLOC(1, sizeof(VkSampler));
if (!sampler)
return NULL;
if (vkCreateSampler(screen->dev, &sci, NULL, sampler) != VK_SUCCESS) {
FREE(sampler);
return NULL;
}
return sampler;
}
@@ -178,8 +182,10 @@ zink_bind_sampler_states(struct pipe_context *pctx,
void **samplers)
{
struct zink_context *ctx = zink_context(pctx);
for (unsigned i = 0; i < num_samplers; ++i)
ctx->samplers[shader][start_slot + i] = (VkSampler)samplers[i];
for (unsigned i = 0; i < num_samplers; ++i) {
VkSampler *sampler = samplers[i];
ctx->samplers[shader][start_slot + i] = sampler ? *sampler : VK_NULL_HANDLE;
}
ctx->num_samplers[shader] = start_slot + num_samplers;
}
@@ -188,8 +194,9 @@ zink_delete_sampler_state(struct pipe_context *pctx,
void *sampler_state)
{
struct zink_batch *batch = zink_curr_batch(zink_context(pctx));
util_dynarray_append(&batch->zombie_samplers,
VkSampler, sampler_state);
util_dynarray_append(&batch->zombie_samplers, VkSampler,
*(VkSampler *)sampler_state);
FREE(sampler_state);
}