aboutsummaryrefslogtreecommitdiffstats
path: root/src/compiler/spirv
diff options
context:
space:
mode:
authorKristian H. Kristensen <[email protected]>2020-02-03 12:11:45 -0800
committerMarge Bot <[email protected]>2020-02-04 06:03:52 +0000
commit0bc516fceb742e4c1ce2d47f129d19d8bb005d13 (patch)
treea6765616c44fb2fc38d9109eefee39530f64682d /src/compiler/spirv
parent67dd51606ca1670e21ce414591cc48caaf2e2e9f (diff)
spirv/opencl: Cast opcode up front to avoid warnings
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3686>
Diffstat (limited to 'src/compiler/spirv')
-rw-r--r--src/compiler/spirv/vtn_opencl.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/compiler/spirv/vtn_opencl.c b/src/compiler/spirv/vtn_opencl.c
index 81328d23854..7cd127af894 100644
--- a/src/compiler/spirv/vtn_opencl.c
+++ b/src/compiler/spirv/vtn_opencl.c
@@ -316,7 +316,9 @@ bool
vtn_handle_opencl_instruction(struct vtn_builder *b, SpvOp ext_opcode,
const uint32_t *w, unsigned count)
{
- switch ((enum OpenCLstd_Entrypoints)ext_opcode) {
+ enum OpenCLstd_Entrypoints cl_opcode = (enum OpenCLstd_Entrypoints) ext_opcode;
+
+ switch (cl_opcode) {
case OpenCLstd_Fabs:
case OpenCLstd_SAbs:
case OpenCLstd_UAbs:
@@ -352,7 +354,7 @@ vtn_handle_opencl_instruction(struct vtn_builder *b, SpvOp ext_opcode,
case OpenCLstd_SSub_sat:
case OpenCLstd_USub_sat:
case OpenCLstd_Trunc:
- handle_instr(b, ext_opcode, w, count, handle_alu);
+ handle_instr(b, cl_opcode, w, count, handle_alu);
return true;
case OpenCLstd_SAbs_diff:
case OpenCLstd_UAbs_diff:
@@ -388,22 +390,22 @@ vtn_handle_opencl_instruction(struct vtn_builder *b, SpvOp ext_opcode,
case OpenCLstd_Smoothstep:
case OpenCLstd_S_Upsample:
case OpenCLstd_U_Upsample:
- handle_instr(b, ext_opcode, w, count, handle_special);
+ handle_instr(b, cl_opcode, w, count, handle_special);
return true;
case OpenCLstd_Vloadn:
- vtn_handle_opencl_vload(b, ext_opcode, w, count);
+ vtn_handle_opencl_vload(b, cl_opcode, w, count);
return true;
case OpenCLstd_Vstoren:
- vtn_handle_opencl_vstore(b, ext_opcode, w, count);
+ vtn_handle_opencl_vstore(b, cl_opcode, w, count);
return true;
case OpenCLstd_Shuffle:
- handle_instr(b, ext_opcode, w, count, handle_shuffle);
+ handle_instr(b, cl_opcode, w, count, handle_shuffle);
return true;
case OpenCLstd_Shuffle2:
- handle_instr(b, ext_opcode, w, count, handle_shuffle2);
+ handle_instr(b, cl_opcode, w, count, handle_shuffle2);
return true;
case OpenCLstd_Printf:
- handle_instr(b, ext_opcode, w, count, handle_printf);
+ handle_instr(b, cl_opcode, w, count, handle_printf);
return true;
case OpenCLstd_Prefetch:
/* TODO maybe add a nir instruction for this? */