Mesa (master): spirv: Be consistent when checking for Shader/Kernel

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Feb 21 22:16:21 UTC 2020


Module: Mesa
Branch: master
Commit: f58b384fbef0cbfd8349c5baa28f2973d079cd7f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f58b384fbef0cbfd8349c5baa28f2973d079cd7f

Author: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Date:   Wed Feb 19 08:03:47 2020 -0800

spirv: Be consistent when checking for Shader/Kernel

Use == and != instead of the ordered comparisons.

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3911>

---

 src/compiler/spirv/spirv_to_nir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 822e3289b65..ad2a4dab556 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -4183,7 +4183,7 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
          b->options->temp_addr_format = nir_address_format_64bit_global;
          break;
       case SpvAddressingModelLogical:
-         vtn_fail_if(b->shader->info.stage >= MESA_SHADER_STAGES,
+         vtn_fail_if(b->shader->info.stage == MESA_SHADER_KERNEL,
                      "AddressingModelLogical only supported for shaders");
          b->physical_ptrs = false;
          break;



More information about the mesa-commit mailing list