fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 12:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: rewrite image/sampler glsl -> vk type functions for robustness

Browse source 
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8504>
This commit is contained in:
Mike Blumenkrantz 2021-01-15 08:12:27 -05:00 • committed by Marge Bot
parent 177a42333f
commit 139ae442c6
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h
View file

@ -56,11 +56,19 @@ static inline VkDescriptorType
zink_sampler_type(const struct glsl_type *type)
{
assert(glsl_type_is_sampler(type));
if (glsl_get_sampler_dim(type) < GLSL_SAMPLER_DIM_BUF || glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_MS)
switch (glsl_get_sampler_dim(type)) {
case GLSL_SAMPLER_DIM_1D:
case GLSL_SAMPLER_DIM_2D:
case GLSL_SAMPLER_DIM_3D:
case GLSL_SAMPLER_DIM_CUBE:
case GLSL_SAMPLER_DIM_RECT:
case GLSL_SAMPLER_DIM_MS:
return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_BUF)
case GLSL_SAMPLER_DIM_BUF:
return VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
unreachable("unimplemented");
default:
unreachable("unimplemented");
}
return 0;
}
@ -68,11 +76,19 @@ static inline VkDescriptorType
zink_image_type(const struct glsl_type *type)
{
assert(glsl_type_is_image(type));
if (glsl_get_sampler_dim(type) < GLSL_SAMPLER_DIM_BUF || glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_MS)
switch (glsl_get_sampler_dim(type)) {
case GLSL_SAMPLER_DIM_1D:
case GLSL_SAMPLER_DIM_2D:
case GLSL_SAMPLER_DIM_3D:
case GLSL_SAMPLER_DIM_CUBE:
case GLSL_SAMPLER_DIM_RECT:
case GLSL_SAMPLER_DIM_MS:
return VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_BUF)
case GLSL_SAMPLER_DIM_BUF:
return VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
unreachable("unimplemented");
default:
unreachable("unimplemented");
}
return 0;
}