[PATCH 1/2] mesa: Fix clang build error w/ util_blitter_get_color_format_for_zs()

[John Stultz <john.stultz@xxxxxxxxxx>]

Building with clang, I'm seeing
 u_blitter.h:627:1: error: control may reach end of non-void function [-Werror,-Wreturn-type]

The util_blitter_get_color_format_for_zs() asserts for any
unhandled types, so we do not expect to reach the end of the
function here.

But provide a dummy return with an explicit assert above
to ensure we don't hit it with any future changes to the logic.

Cc: Rob Clark <robdclark@xxxxxxxxxxxx>
Cc: Emil Velikov <emil.l.velikov@xxxxxxxxx>
Cc: Amit Pundir <amit.pundir@xxxxxxxxxx>
Cc: Sumit Semwal <sumit.semwal@xxxxxxxxxx>
Cc: Alistair Strachan <astrachan@xxxxxxxxxx>
Cc: Greg Hartman <ghartman@xxxxxxxxxx>
Cc: Tapani Pälli <tapani.palli@xxxxxxxxx>
Cc: Marek Olšák <marek.olsak@xxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
---
 src/gallium/auxiliary/util/u_blitter.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h
index 9e3fa55e648..7d6c3db64da 100644
--- a/src/gallium/auxiliary/util/u_blitter.h
+++ b/src/gallium/auxiliary/util/u_blitter.h
@@ -624,6 +624,9 @@ util_blitter_get_color_format_for_zs(enum pipe_format format)
    default:
       assert(0);
    }
+   assert(0);
+   /*XXX NEVER GET HERE*/
+   return PIPE_FORMAT_R32G32_UINT;
 }
 
 #ifdef __cplusplus
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel