Mesa (master): i965: Separate gen < 8 and gen >= 8 paths explicitly in wrap_mode()

[Topi Pohjolainen]

Module: Mesa
Branch: master
Commit: b3bf453686236661522a59441f5fdff4753b3089
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3bf453686236661522a59441f5fdff4753b3089

Author: Topi Pohjolainen <topi.pohjolainen at intel.com>
Date:   Mon Jun 26 10:43:15 2017 +0300

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 <kenneth at whitecape.org>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

---

 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 3f8a7265db..d65b468863 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: