i965: Combine gen6_clip_state.c and gen7_clip_state.c.

The changes between Gen6-7 are minimal, and can easily be solved with
an extra generation check.  This cuts a lot of duplicated code.

It also helps prevent even more duplication for Broadwell.

Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>

3 files changed, 42 insertions, 140 deletions

diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 14b2f61fb6f..4714100695e 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -124,7 +124,6 @@ i965_FILES = \
 	gen6_vs_state.c \
 	gen6_wm_state.c \
 	gen7_blorp.cpp \
-	gen7_clip_state.c \
 	gen7_disable.c \
         gen7_gs_state.c \
 	gen7_misc_state.c \
diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gen6_clip_state.c
index 08b57c762ea..03d0f9057c1 100644
--- a/src/mesa/drivers/dri/i965/gen6_clip_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c
@@ -36,6 +36,7 @@ static void
 upload_clip_state(struct brw_context *brw)
 {
    struct gl_context *ctx = &brw->ctx;
+   /* BRW_NEW_META_IN_PROGRESS */
    uint32_t dw1 = brw->meta_in_progress ? 0 : GEN6_CLIP_STATISTICS_ENABLE;
    uint32_t dw2 = 0;
 
@@ -48,6 +49,33 @@ upload_clip_state(struct brw_context *brw)
       dw2 |= GEN6_CLIP_NON_PERSPECTIVE_BARYCENTRIC_ENABLE;
    }
 
+   if (brw->gen >= 7) {
+      dw1 |= GEN7_CLIP_EARLY_CULL;
+
+      /* _NEW_POLYGON */
+      if ((ctx->Polygon.FrontFace == GL_CCW) ^ _mesa_is_user_fbo(fb))
+         dw1 |= GEN7_CLIP_WINDING_CCW;
+
+      if (ctx->Polygon.CullFlag) {
+         switch (ctx->Polygon.CullFaceMode) {
+         case GL_FRONT:
+            dw1 |= GEN7_CLIP_CULLMODE_FRONT;
+            break;
+         case GL_BACK:
+            dw1 |= GEN7_CLIP_CULLMODE_BACK;
+            break;
+         case GL_FRONT_AND_BACK:
+            dw1 |= GEN7_CLIP_CULLMODE_BOTH;
+            break;
+         default:
+            assert(!"Should not get here: invalid CullFlag");
+            break;
+         }
+      } else {
+         dw1 |= GEN7_CLIP_CULLMODE_NONE;
+      }
+   }
+
    if (!ctx->Transform.DepthClamp)
       dw2 |= GEN6_CLIP_Z_TEST;
 
@@ -79,7 +107,8 @@ upload_clip_state(struct brw_context *brw)
    if (ctx->RasterDiscard) {
       dw2 |= GEN6_CLIP_MODE_REJECT_ALL;
       perf_debug("Rasterizer discard is currently implemented via the clipper; "
-                 "having the GS not write primitives would likely be faster.");
+                 "%s be faster.", brw->gen >= 7 ? "using the SOL unit may" :
+                 "having the GS not write primitives would likely");
    }
 
    BEGIN_BATCH(4);
@@ -92,7 +121,7 @@ upload_clip_state(struct brw_context *brw)
 	     dw2);
    OUT_BATCH(U_FIXED(0.125, 3) << GEN6_CLIP_MIN_POINT_WIDTH_SHIFT |
              U_FIXED(255.875, 3) << GEN6_CLIP_MAX_POINT_WIDTH_SHIFT |
-             GEN6_CLIP_FORCE_ZERO_RTAINDEX);
+             (fb->Layered ? 0 : GEN6_CLIP_FORCE_ZERO_RTAINDEX));
    ADVANCE_BATCH();
 }
 
@@ -106,3 +135,14 @@ const struct brw_tracked_state gen6_clip_state = {
    },
    .emit = upload_clip_state,
 };
+
+const struct brw_tracked_state gen7_clip_state = {
+   .dirty = {
+      .mesa  = _NEW_BUFFERS | _NEW_LIGHT | _NEW_POLYGON | _NEW_TRANSFORM,
+      .brw   = BRW_NEW_CONTEXT |
+               BRW_NEW_META_IN_PROGRESS |
+               BRW_NEW_RASTERIZER_DISCARD,
+      .cache = CACHE_NEW_WM_PROG
+   },
+   .emit = upload_clip_state,
+};
diff --git a/src/mesa/drivers/dri/i965/gen7_clip_state.c b/src/mesa/drivers/dri/i965/gen7_clip_state.c
deleted file mode 100644
index 5c095a1132a..00000000000
--- a/src/mesa/drivers/dri/i965/gen7_clip_state.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright © 2011 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "brw_context.h"
-#include "brw_state.h"
-#include "brw_defines.h"
-#include "brw_util.h"
-#include "intel_batchbuffer.h"
-#include "main/fbobject.h"
-
-static void
-upload_clip_state(struct brw_context *brw)
-{
-   struct gl_context *ctx = &brw->ctx;
-   uint32_t dw1 = 0, dw2 = 0;
-
-   /* _NEW_BUFFERS */
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   bool render_to_fbo = _mesa_is_user_fbo(fb);
-
-   /* BRW_NEW_META_IN_PROGRESS */
-   if (!brw->meta_in_progress)
-      dw1 |= GEN6_CLIP_STATISTICS_ENABLE;
-
-   /* CACHE_NEW_WM_PROG */
-   if (brw->wm.prog_data->barycentric_interp_modes &
-       BRW_WM_NONPERSPECTIVE_BARYCENTRIC_BITS) {
-      dw2 |= GEN6_CLIP_NON_PERSPECTIVE_BARYCENTRIC_ENABLE;
-   }
-
-   dw1 |= GEN7_CLIP_EARLY_CULL;
-
-   /* _NEW_POLYGON */
-   if ((ctx->Polygon.FrontFace == GL_CCW) ^ render_to_fbo)
-      dw1 |= GEN7_CLIP_WINDING_CCW;
-
-   if (ctx->Polygon.CullFlag) {
-      switch (ctx->Polygon.CullFaceMode) {
-      case GL_FRONT:
-	 dw1 |= GEN7_CLIP_CULLMODE_FRONT;
-	 break;
-      case GL_BACK:
-	 dw1 |= GEN7_CLIP_CULLMODE_BACK;
-	 break;
-      case GL_FRONT_AND_BACK:
-	 dw1 |= GEN7_CLIP_CULLMODE_BOTH;
-	 break;
-      default:
-	 assert(!"Should not get here: invalid CullFlag");
-	 break;
-      }
-   } else {
-      dw1 |= GEN7_CLIP_CULLMODE_NONE;
-   }
-
-   /* _NEW_TRANSFORM */
-   if (!ctx->Transform.DepthClamp)
-      dw2 |= GEN6_CLIP_Z_TEST;
-
-   /* _NEW_LIGHT */
-   if (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION) {
-      dw2 |=
-	 (0 << GEN6_CLIP_TRI_PROVOKE_SHIFT) |
-	 (1 << GEN6_CLIP_TRIFAN_PROVOKE_SHIFT) |
-	 (0 << GEN6_CLIP_LINE_PROVOKE_SHIFT);
-   } else {
-      dw2 |=
-	 (2 << GEN6_CLIP_TRI_PROVOKE_SHIFT) |
-	 (2 << GEN6_CLIP_TRIFAN_PROVOKE_SHIFT) |
-	 (1 << GEN6_CLIP_LINE_PROVOKE_SHIFT);
-   }
-
-   /* _NEW_TRANSFORM */
-   dw2 |= (ctx->Transform.ClipPlanesEnabled <<
-           GEN6_USER_CLIP_CLIP_DISTANCES_SHIFT);
-
-   if (ctx->Viewport.X == 0 &&
-       ctx->Viewport.Y == 0 &&
-       ctx->Viewport.Width == fb->Width &&
-       ctx->Viewport.Height == fb->Height) {
-      dw2 |= GEN6_CLIP_GB_TEST;
-   }
-
-   /* BRW_NEW_RASTERIZER_DISCARD */
-   if (ctx->RasterDiscard) {
-      dw2 |= GEN6_CLIP_MODE_REJECT_ALL;
-      perf_debug("Rasterizer discard is currently implemented via the clipper; "
-                 "using the SOL unit may be faster.");
-   }
-
-   BEGIN_BATCH(4);
-   OUT_BATCH(_3DSTATE_CLIP << 16 | (4 - 2));
-   OUT_BATCH(dw1);
-   OUT_BATCH(GEN6_CLIP_ENABLE |
-	     GEN6_CLIP_API_OGL |
-	     GEN6_CLIP_MODE_NORMAL |
-	     GEN6_CLIP_XY_TEST |
-             dw2);
-   OUT_BATCH(U_FIXED(0.125, 3) << GEN6_CLIP_MIN_POINT_WIDTH_SHIFT |
-             U_FIXED(255.875, 3) << GEN6_CLIP_MAX_POINT_WIDTH_SHIFT |
-             (fb->Layered ? 0 : GEN6_CLIP_FORCE_ZERO_RTAINDEX));
-   ADVANCE_BATCH();
-}
-
-const struct brw_tracked_state gen7_clip_state = {
-   .dirty = {
-      .mesa  = (_NEW_BUFFERS |
-                _NEW_POLYGON |
-                _NEW_LIGHT |
-                _NEW_TRANSFORM),
-      .brw   = BRW_NEW_CONTEXT |
-               BRW_NEW_META_IN_PROGRESS |
-               BRW_NEW_RASTERIZER_DISCARD,
-      .cache = CACHE_NEW_WM_PROG
-   },
-   .emit = upload_clip_state,
-};