i965: Add HiZ operation state to brw_context

[mesa.git] / src / mesa / drivers / dri / i965 / gen6_viewport_state.c

diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c b/src/mesa/drivers/dri/i965/gen6_viewport_state.c
index cd7d209e3eadb74c795dbbc77750a16985cdbf7b..9ff2bd95680b49122bb4813236b086bee42b372b 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c
@@ -39,40 +39,43 @@
  * up in the guardband or not.
  */
 static void
-prepare_clip_vp(struct brw_context *brw)
+gen6_upload_clip_vp(struct brw_context *brw)
 {
-   struct brw_clipper_viewport vp;
+   struct brw_clipper_viewport *vp;
 
-   vp.xmin = -1.0;
-   vp.xmax = 1.0;
-   vp.ymin = -1.0;
-   vp.ymax = 1.0;
+   vp = brw_state_batch(brw, AUB_TRACE_CLIP_VP_STATE,
+                       sizeof(*vp), 32, &brw->clip.vp_offset);
 
-   drm_intel_bo_unreference(brw->clip.vp_bo);
-   brw->clip.vp_bo = brw_cache_data(&brw->cache, BRW_CLIP_VP,
-                                   &vp, sizeof(vp));
+   vp->xmin = -1.0;
+   vp->xmax = 1.0;
+   vp->ymin = -1.0;
+   vp->ymax = 1.0;
+
+   brw->state.dirty.cache |= CACHE_NEW_CLIP_VP;
 }
 
 const struct brw_tracked_state gen6_clip_vp = {
    .dirty = {
-      .mesa = _NEW_VIEWPORT, /* XXX: not really, but we need nonzero */
-      .brw = 0,
+      .mesa = 0,
+      .brw = BRW_NEW_BATCH,
       .cache = 0,
    },
-   .prepare = prepare_clip_vp,
+   .emit = gen6_upload_clip_vp,
 };
 
 static void
-prepare_sf_vp(struct brw_context *brw)
+gen6_upload_sf_vp(struct brw_context *brw)
 {
    struct gl_context *ctx = &brw->intel.ctx;
    const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF;
-   struct brw_sf_viewport sfv;
+   struct brw_sf_viewport *sfv;
    GLfloat y_scale, y_bias;
-   const GLboolean render_to_fbo = (ctx->DrawBuffer->Name != 0);
+   const bool render_to_fbo = (ctx->DrawBuffer->Name != 0);
    const GLfloat *v = ctx->Viewport._WindowMap.m;
 
-   memset(&sfv, 0, sizeof(sfv));
+   sfv = brw_state_batch(brw, AUB_TRACE_SF_VP_STATE,
+                        sizeof(*sfv), 32, &brw->sf.vp_offset);
+   memset(sfv, 0, sizeof(*sfv));
 
    /* _NEW_BUFFERS */
    if (render_to_fbo) {
@@ -84,34 +87,25 @@ prepare_sf_vp(struct brw_context *brw)
    }
 
    /* _NEW_VIEWPORT */
-   sfv.viewport.m00 = v[MAT_SX];
-   sfv.viewport.m11 = v[MAT_SY] * y_scale;
-   sfv.viewport.m22 = v[MAT_SZ] * depth_scale;
-   sfv.viewport.m30 = v[MAT_TX];
-   sfv.viewport.m31 = v[MAT_TY] * y_scale + y_bias;
-   sfv.viewport.m32 = v[MAT_TZ] * depth_scale;
+   sfv->viewport.m00 = v[MAT_SX];
+   sfv->viewport.m11 = v[MAT_SY] * y_scale;
+   sfv->viewport.m22 = v[MAT_SZ] * depth_scale;
+   sfv->viewport.m30 = v[MAT_TX];
+   sfv->viewport.m31 = v[MAT_TY] * y_scale + y_bias;
+   sfv->viewport.m32 = v[MAT_TZ] * depth_scale;
 
-   drm_intel_bo_unreference(brw->sf.vp_bo);
-   brw->sf.vp_bo = brw_cache_data(&brw->cache, BRW_SF_VP,
-                                 &sfv, sizeof(sfv));
+   brw->state.dirty.cache |= CACHE_NEW_SF_VP;
 }
 
 const struct brw_tracked_state gen6_sf_vp = {
    .dirty = {
       .mesa = _NEW_VIEWPORT | _NEW_BUFFERS,
-      .brw = 0,
+      .brw = BRW_NEW_BATCH,
       .cache = 0,
    },
-   .prepare = prepare_sf_vp,
+   .emit = gen6_upload_sf_vp,
 };
 
-static void prepare_viewport_state_pointers(struct brw_context *brw)
-{
-   brw_add_validated_bo(brw, brw->clip.vp_bo);
-   brw_add_validated_bo(brw, brw->sf.vp_bo);
-   brw_add_validated_bo(brw, brw->cc.vp_bo);
-}
-
 static void upload_viewport_state_pointers(struct brw_context *brw)
 {
    struct intel_context *intel = &brw->intel;
@@ -121,20 +115,20 @@ static void upload_viewport_state_pointers(struct brw_context *brw)
             GEN6_CC_VIEWPORT_MODIFY |
             GEN6_SF_VIEWPORT_MODIFY |
             GEN6_CLIP_VIEWPORT_MODIFY);
-   OUT_RELOC(brw->clip.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-   OUT_RELOC(brw->sf.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-   OUT_RELOC(brw->cc.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+   OUT_BATCH(brw->clip.vp_offset);
+   OUT_BATCH(brw->sf.vp_offset);
+   OUT_BATCH(brw->cc.vp_offset);
    ADVANCE_BATCH();
 }
 
 const struct brw_tracked_state gen6_viewport_state = {
    .dirty = {
       .mesa = 0,
-      .brw = BRW_NEW_BATCH,
+      .brw = (BRW_NEW_BATCH |
+             BRW_NEW_STATE_BASE_ADDRESS),
       .cache = (CACHE_NEW_CLIP_VP |
                CACHE_NEW_SF_VP |
                CACHE_NEW_CC_VP)
    },
-   .prepare = prepare_viewport_state_pointers,
    .emit = upload_viewport_state_pointers,
 };