Module: Mesa Branch: master Commit: 37ad6bfcd8f387f218c757b5d9b4da0286c2e5dc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=37ad6bfcd8f387f218c757b5d9b4da0286c2e5dc
Author: Mike Blumenkrantz <[email protected]> Date: Fri Oct 9 17:32:59 2020 -0400 zink: handle GLSL_SAMPLER_DIM_EXTERNAL in ntv this fixes most of the tests that use it Acked-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9276> --- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h index 068d97f711a..ed96a4c2e9e 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h +++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h @@ -63,6 +63,7 @@ zink_sampler_type(const struct glsl_type *type) case GLSL_SAMPLER_DIM_CUBE: case GLSL_SAMPLER_DIM_RECT: case GLSL_SAMPLER_DIM_MS: + case GLSL_SAMPLER_DIM_EXTERNAL: return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; case GLSL_SAMPLER_DIM_BUF: return VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; @@ -83,6 +84,7 @@ zink_image_type(const struct glsl_type *type) case GLSL_SAMPLER_DIM_CUBE: case GLSL_SAMPLER_DIM_RECT: case GLSL_SAMPLER_DIM_MS: + case GLSL_SAMPLER_DIM_EXTERNAL: return VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; case GLSL_SAMPLER_DIM_BUF: return VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
