From f3164c2ed96a119c73f16c4703bf5ad9feff1416 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 30 Mar 2018 11:10:11 -0600 Subject: [PATCH] nir/spirv: s/uint32_t/SpvOp/ in various functions The MSVC compiler warns when the function parameter types don't exactly match with respect to enum vs. uint32_t. Use SpvOp everywhere. Alternately, uint32_t could be used everywhere. There doesn't seem to be an advantage to one over the other. Reviewed-by: Neil Roberts --- src/compiler/spirv/vtn_amd.c | 4 ++-- src/compiler/spirv/vtn_glsl450.c | 2 +- src/compiler/spirv/vtn_private.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/compiler/spirv/vtn_amd.c b/src/compiler/spirv/vtn_amd.c index 320e3b0586c..0d5b429783b 100644 --- a/src/compiler/spirv/vtn_amd.c +++ b/src/compiler/spirv/vtn_amd.c @@ -27,7 +27,7 @@ #include "GLSL.ext.AMD.h" bool -vtn_handle_amd_gcn_shader_instruction(struct vtn_builder *b, uint32_t ext_opcode, +vtn_handle_amd_gcn_shader_instruction(struct vtn_builder *b, SpvOp ext_opcode, const uint32_t *w, unsigned count) { const struct glsl_type *dest_type = @@ -57,7 +57,7 @@ vtn_handle_amd_gcn_shader_instruction(struct vtn_builder *b, uint32_t ext_opcode } bool -vtn_handle_amd_shader_trinary_minmax_instruction(struct vtn_builder *b, uint32_t ext_opcode, +vtn_handle_amd_shader_trinary_minmax_instruction(struct vtn_builder *b, SpvOp ext_opcode, const uint32_t *w, unsigned count) { struct nir_builder *nb = &b->nb; diff --git a/src/compiler/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c index eb0b90f7976..d208215ccb5 100644 --- a/src/compiler/spirv/vtn_glsl450.c +++ b/src/compiler/spirv/vtn_glsl450.c @@ -810,7 +810,7 @@ handle_glsl450_interpolation(struct vtn_builder *b, enum GLSLstd450 opcode, } bool -vtn_handle_glsl450_instruction(struct vtn_builder *b, uint32_t ext_opcode, +vtn_handle_glsl450_instruction(struct vtn_builder *b, SpvOp ext_opcode, const uint32_t *w, unsigned count) { switch ((enum GLSLstd450)ext_opcode) { diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h index 982b426e70d..b501bbf9b4a 100644 --- a/src/compiler/spirv/vtn_private.h +++ b/src/compiler/spirv/vtn_private.h @@ -230,7 +230,7 @@ struct vtn_function { SpvFunctionControlMask control; }; -typedef bool (*vtn_instruction_handler)(struct vtn_builder *, uint32_t, +typedef bool (*vtn_instruction_handler)(struct vtn_builder *, SpvOp, const uint32_t *, unsigned); void vtn_build_cfg(struct vtn_builder *b, const uint32_t *words, @@ -718,7 +718,7 @@ void vtn_handle_alu(struct vtn_builder *b, SpvOp opcode, void vtn_handle_subgroup(struct vtn_builder *b, SpvOp opcode, const uint32_t *w, unsigned count); -bool vtn_handle_glsl450_instruction(struct vtn_builder *b, uint32_t ext_opcode, +bool vtn_handle_glsl450_instruction(struct vtn_builder *b, SpvOp ext_opcode, const uint32_t *words, unsigned count); struct vtn_builder* vtn_create_builder(const uint32_t *words, size_t word_count, @@ -744,9 +744,9 @@ vtn_u64_literal(const uint32_t *w) return (uint64_t)w[1] << 32 | w[0]; } -bool vtn_handle_amd_gcn_shader_instruction(struct vtn_builder *b, uint32_t ext_opcode, +bool vtn_handle_amd_gcn_shader_instruction(struct vtn_builder *b, SpvOp ext_opcode, const uint32_t *words, unsigned count); -bool vtn_handle_amd_shader_trinary_minmax_instruction(struct vtn_builder *b, uint32_t ext_opcode, +bool vtn_handle_amd_shader_trinary_minmax_instruction(struct vtn_builder *b, SpvOp ext_opcode, const uint32_t *words, unsigned count); #endif /* _VTN_PRIVATE_H_ */ -- 2.30.2