KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spirv/opencl: Cast opcode up front to avoid warnings 

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3686>
This commit is contained in:
Kristian H. Kristensen 2020-02-03 12:11:45 -08:00 committed by Marge Bot
parent 67dd51606c
commit 0bc516fceb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/spirv/vtn_opencl.c
View File

@ -316,7 +316,9 @@ bool
vtn_handle_opencl_instruction(struct vtn_builder *b, SpvOp ext_opcode, vtn_handle_opencl_instruction(struct vtn_builder *b, SpvOp ext_opcode,
const uint32_t *w, unsigned count) 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_Fabs:
case OpenCLstd_SAbs: case OpenCLstd_SAbs:
case OpenCLstd_UAbs: case OpenCLstd_UAbs:
@ -352,7 +354,7 @@ vtn_handle_opencl_instruction(struct vtn_builder *b, SpvOp ext_opcode,
case OpenCLstd_SSub_sat: case OpenCLstd_SSub_sat:
case OpenCLstd_USub_sat: case OpenCLstd_USub_sat:
case OpenCLstd_Trunc: case OpenCLstd_Trunc:
handle_instr(b, ext_opcode, w, count, handle_alu); handle_instr(b, cl_opcode, w, count, handle_alu);
return true; return true;
case OpenCLstd_SAbs_diff: case OpenCLstd_SAbs_diff:
case OpenCLstd_UAbs_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_Smoothstep:
case OpenCLstd_S_Upsample: case OpenCLstd_S_Upsample:
case OpenCLstd_U_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; return true;
case OpenCLstd_Vloadn: case OpenCLstd_Vloadn:
vtn_handle_opencl_vload(b, ext_opcode, w, count); vtn_handle_opencl_vload(b, cl_opcode, w, count);
return true; return true;
case OpenCLstd_Vstoren: case OpenCLstd_Vstoren:
vtn_handle_opencl_vstore(b, ext_opcode, w, count); vtn_handle_opencl_vstore(b, cl_opcode, w, count);
return true; return true;
case OpenCLstd_Shuffle: case OpenCLstd_Shuffle:
handle_instr(b, ext_opcode, w, count, handle_shuffle); handle_instr(b, cl_opcode, w, count, handle_shuffle);
return true; return true;
case OpenCLstd_Shuffle2: case OpenCLstd_Shuffle2:
handle_instr(b, ext_opcode, w, count, handle_shuffle2); handle_instr(b, cl_opcode, w, count, handle_shuffle2);
return true; return true;
case OpenCLstd_Printf: case OpenCLstd_Printf:
handle_instr(b, ext_opcode, w, count, handle_printf); handle_instr(b, cl_opcode, w, count, handle_printf);
return true; return true;
case OpenCLstd_Prefetch: case OpenCLstd_Prefetch:
/* TODO maybe add a nir instruction for this? */ /* TODO maybe add a nir instruction for this? */