i965: Add HiZ operation state to brw_context

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

diff --git a/src/mesa/drivers/dri/i965/gen7_viewport_state.c b/src/mesa/drivers/dri/i965/gen7_viewport_state.c
index 838ad3a394842d4c1825c86ccbf44d53fed11f0b..252a35b21fcf3ebf12c46b132723e24cb46be293 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen7_viewport_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_viewport_state.c
@@ -27,16 +27,18 @@
 #include "intel_batchbuffer.h"
 
 static void
-prepare_sf_clip_viewport(struct brw_context *brw)
+gen7_upload_sf_clip_viewport(struct brw_context *brw)
 {
-   struct gl_context *ctx = &brw->intel.ctx;
+   struct intel_context *intel = &brw->intel;
+   struct gl_context *ctx = &intel->ctx;
    const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF;
    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;
    struct gen7_sf_clip_viewport *vp;
 
-   vp = brw_state_batch(brw, sizeof(vp), 64, &brw->sf.vp_offset);
+   vp = brw_state_batch(brw, AUB_TRACE_SF_VP_STATE,
+                       sizeof(vp), 64, &brw->sf.vp_offset);
    /* Also assign to clip.vp_offset in case something uses it. */
    brw->clip.vp_offset = brw->sf.vp_offset;
 
@@ -62,11 +64,6 @@ prepare_sf_clip_viewport(struct brw_context *brw)
    vp->viewport.m30 = v[MAT_TX];
    vp->viewport.m31 = v[MAT_TY] * y_scale + y_bias;
    vp->viewport.m32 = v[MAT_TZ] * depth_scale;
-}
-
-static void upload_sf_clip_viewport_state_pointer(struct brw_context *brw)
-{
-   struct intel_context *intel = &brw->intel;
 
    BEGIN_BATCH(2);
    OUT_BATCH(_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CL << 16 | (2 - 2));
@@ -80,8 +77,7 @@ const struct brw_tracked_state gen7_sf_clip_viewport = {
       .brw = BRW_NEW_BATCH,
       .cache = 0,
    },
-   .prepare = prepare_sf_clip_viewport,
-   .emit = upload_sf_clip_viewport_state_pointer,
+   .emit = gen7_upload_sf_clip_viewport,
 };
 
 /* ----------------------------------------------------- */