From b3bf453686236661522a59441f5fdff4753b3089 Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Mon, 26 Jun 2017 10:43:15 +0300 Subject: [PATCH] i965: Separate gen < 8 and gen >= 8 paths explicitly in wrap_mode() Makes coverity happier. Fix indentation in gen >= 8 block while at it. CID: 1413020 Reviewed-by: Kenneth Graunke Reviewed-by: Eric Engestrom Signed-off-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/genX_state_upload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index 3f8a7265db9..d65b4688638 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -4455,9 +4455,8 @@ translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest) * * Gen8+ supports this natively. */ - return TCM_HALF_BORDER; -#endif - + return TCM_HALF_BORDER; +#else /* On Gen4-7.5, we clamp the coordinates in the fragment shader * and set clamp_border here, which gets the result desired. * We just use clamp(_to_edge) for nearest, because for nearest @@ -4468,6 +4467,7 @@ translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest) return TCM_CLAMP; else return TCM_CLAMP_BORDER; +#endif case GL_CLAMP_TO_EDGE: return TCM_CLAMP; case GL_CLAMP_TO_BORDER: -- 2.30.2