X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fgen6_clip_state.c;h=0ba190ea79230336f571c55d45012155c979caea;hb=2747f6a1f9d27826346d330cceef44b800267bcb;hp=acc4b7f1019130814826b166c3ee5ac50d15822b;hpb=feb619b7705897ca723e8fe728f739932f743327;p=mesa.git

diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gen6_clip_state.c
index acc4b7f1019..0ba190ea792 100644
--- a/src/mesa/drivers/dri/i965/gen6_clip_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c
@@ -28,48 +28,131 @@
 #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 intel_context *intel = &brw->intel;
-   GLcontext *ctx = &intel->ctx;
-   uint32_t depth_clamp = 0;
-   uint32_t provoking;
+   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;
 
-   if (!ctx->Transform.DepthClamp)
-      depth_clamp = GEN6_CLIP_Z_TEST;
+   /* _NEW_BUFFERS */
+   struct gl_framebuffer *fb = ctx->DrawBuffer;
 
+   /* CACHE_NEW_WM_PROG */
+   if (brw->wm.prog_data->barycentric_interp_modes &
+       BRW_WM_NONPERSPECTIVE_BARYCENTRIC_BITS) {
+      dw2 |= GEN6_CLIP_NON_PERSPECTIVE_BARYCENTRIC_ENABLE;
+   }
+
+   if (brw->gen >= 7)
+      dw1 |= GEN7_CLIP_EARLY_CULL;
+
+   if (brw->gen == 7) {
+      /* _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 (brw->gen < 8 && !ctx->Transform.DepthClamp)
+      dw2 |= GEN6_CLIP_Z_TEST;
+
+   /* _NEW_LIGHT */
    if (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION) {
-      provoking = 0;
+      dw2 |=
+	 (0 << GEN6_CLIP_TRI_PROVOKE_SHIFT) |
+	 (1 << GEN6_CLIP_TRIFAN_PROVOKE_SHIFT) |
+	 (0 << GEN6_CLIP_LINE_PROVOKE_SHIFT);
    } else {
-      provoking =
+      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);
+
+   dw2 |= GEN6_CLIP_GB_TEST;
+   for (unsigned i = 0; i < ctx->Const.MaxViewports; i++) {
+      if (ctx->ViewportArray[i].X != 0 ||
+          ctx->ViewportArray[i].Y != 0 ||
+          ctx->ViewportArray[i].Width != (float) fb->Width ||
+          ctx->ViewportArray[i].Height != (float) fb->Height) {
+         dw2 &= ~GEN6_CLIP_GB_TEST;
+         if (brw->gen >= 8) {
+            perf_debug("Disabling GB clipping due to lack of Gen8 viewport "
+                       "clipping setup code.  This should be fixed.");
+         }
+         break;
+      }
+   }
+
+   /* BRW_NEW_RASTERIZER_DISCARD */
+   if (ctx->RasterDiscard) {
+      dw2 |= GEN6_CLIP_MODE_REJECT_ALL;
+      perf_debug("Rasterizer discard is currently implemented via the clipper; "
+                 "%s be faster.", brw->gen >= 7 ? "using the SOL unit may" :
+                 "having the GS not write primitives would likely");
+   }
+
    BEGIN_BATCH(4);
-   OUT_BATCH(CMD_3D_CLIP_STATE << 16 | (4 - 2));
-   OUT_BATCH(GEN6_CLIP_STATISTICS_ENABLE);
+   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 |
-	     depth_clamp |
-	     provoking);
-   OUT_BATCH(0);
+	     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->MaxNumLayers > 0 ? 0 : GEN6_CLIP_FORCE_ZERO_RTAINDEX) |
+             ((ctx->Const.MaxViewports - 1) & GEN6_CLIP_MAX_VP_INDEX_MASK));
    ADVANCE_BATCH();
-
-   intel_batchbuffer_emit_mi_flush(intel->batch);
 }
 
 const struct brw_tracked_state gen6_clip_state = {
    .dirty = {
-      .mesa  = _NEW_TRANSFORM,
-      .brw   = BRW_NEW_CONTEXT,
-      .cache = 0
+      .mesa  = _NEW_TRANSFORM | _NEW_LIGHT | _NEW_BUFFERS,
+      .brw   = BRW_NEW_CONTEXT |
+               BRW_NEW_META_IN_PROGRESS |
+               BRW_NEW_RASTERIZER_DISCARD,
+      .cache = CACHE_NEW_WM_PROG
+   },
+   .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,
 };