From feaecbeeabbdc01498bc78cf65c3352a3d56480e Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Sat, 28 Nov 2020 10:12:21 +0100 Subject: [PATCH] r600/sfn: correct error signalling in switch default case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is unreachable, and in release mode it should also indicated that the function will not return something useful here. Also add a default return value just in case a compiler doesn't support the "unreachable" Thanks Dieter Nützel for pointing this error out. Fixes: b6c17e2965621a46eb07ba2605d9f9e221a400b r600/sfn: lower IO for FS inputs and handle interpolation accordingly Signed-off-by: Gert Wollny Part-of: --- src/gallium/drivers/r600/sfn/sfn_nir_merge_stores.cpp | 0 src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 src/gallium/drivers/r600/sfn/sfn_nir_merge_stores.cpp diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_merge_stores.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_merge_stores.cpp new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp index 9a02fc2122f..4d1bc13b199 100644 --- a/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp @@ -95,15 +95,14 @@ unsigned barycentric_ij_index(nir_intrinsic_instr *instr) case INTERP_MODE_SMOOTH: case INTERP_MODE_COLOR: return index; - break; case INTERP_MODE_NOPERSPECTIVE: return index + 3; - break; case INTERP_MODE_FLAT: case INTERP_MODE_EXPLICIT: default: - assert(0 && "unknown/unsupported mode for load_interpolated"); + unreachable("unknown/unsupported mode for load_interpolated"); } + return 0; } bool FragmentShaderFromNir::process_load_input(nir_intrinsic_instr *instr,