From 412e2aa23b8e145ca3eaa6df13dba1fe6c176b71 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 8 Oct 2019 11:54:10 +0200 Subject: [PATCH] zink/spirv: more complete sampler-dim handling Acked-by: Jordan Justen --- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c index 73b817bf4d4..8732bc8839f 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c +++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c @@ -362,12 +362,16 @@ type_to_dim(enum glsl_sampler_dim gdim, bool *is_ms) return SpvDim1D; case GLSL_SAMPLER_DIM_2D: return SpvDim2D; - case GLSL_SAMPLER_DIM_RECT: - return SpvDimRect; - case GLSL_SAMPLER_DIM_CUBE: - return SpvDimCube; case GLSL_SAMPLER_DIM_3D: return SpvDim3D; + case GLSL_SAMPLER_DIM_CUBE: + return SpvDimCube; + case GLSL_SAMPLER_DIM_RECT: + return SpvDimRect; + case GLSL_SAMPLER_DIM_BUF: + return SpvDimBuffer; + case GLSL_SAMPLER_DIM_EXTERNAL: + return SpvDim2D; /* seems dodgy... */ case GLSL_SAMPLER_DIM_MS: *is_ms = true; return SpvDim2D; -- 2.11.0