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

zink: Fix 32-bit compilation 

`sizeof(void*) != sizeof(VkShaderModule)` on x86 hence this fails with `-Werror=int-conversion`

Fixes: 0f059d550b "zink: split up creating zink_shader objects and VkShaderModule objects"

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6239>
This commit is contained in:
Joshua Ashton 2020-08-08 07:24:56 +01:00
parent 08f3dcf2f6
commit b238d17a02
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/zink/zink_compiler.c
View File

@ -217,7 +217,7 @@ update_so_info(struct zink_shader *sh,
VkShaderModule
zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs)
{
VkShaderModule mod = NULL;
VkShaderModule mod = VK_NULL_HANDLE;
void *streamout = zs->streamout.so_info_slots ? &zs->streamout : NULL;
struct spirv_shader *spirv = nir_to_spirv(zs->nir, streamout);
assert(spirv);
@ -240,7 +240,7 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs)
smci.pCode = spirv->words;
if (vkCreateShaderModule(screen->dev, &smci, NULL, &mod) != VK_SUCCESS)
mod = NULL;
mod = VK_NULL_HANDLE;
/* TODO: determine if there's any reason to cache spirv output? */
free(spirv->words);