i965: Move intel_context::no_batch_wrap to brw_context.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index f278c5302ba12a236abd418f8db476ca594ccf19..a6d7abd83f382a28cecf9654b2548dd7952e2552 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -807,6 +807,7 @@ struct brw_context
    drm_intel_context *hw_ctx;
 
    struct intel_batchbuffer batch;
+   bool no_batch_wrap;
 
    /**
     * Set if rendering has occured to the drawable's front buffer.

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index b338fe0fd9fe99e67cebf8b0e09f2fe91f12d6c7..3514082c4dc2efc76fab3d934861c581aa5ddf64 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -443,7 +443,7 @@ retry:
        * brw->state.dirty.brw.
        */
       if (brw->state.dirty.brw) {
-        intel->no_batch_wrap = true;
+        brw->no_batch_wrap = true;
         brw_upload_state(brw);
       }
 
@@ -452,7 +452,7 @@ retry:
       else
         brw_emit_prim(brw, &prim[i], brw->primitive);
 
-      intel->no_batch_wrap = false;
+      brw->no_batch_wrap = false;
 
       if (dri_bufmgr_check_aperture_space(&brw->batch.bo, 1)) {
         if (!fail_next) {

diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 0905237aa895d99d25458e1fec537cfe3adb1d0f..df83e3d695420d2213d1b4a01ee4c9ae777549eb 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -235,7 +235,6 @@ int
 _intel_batchbuffer_flush(struct brw_context *brw,
                         const char *file, int line)
 {
-   struct intel_context *intel = &brw->intel;
    int ret;
 
    if (brw->batch.used == 0)
@@ -265,7 +264,7 @@ _intel_batchbuffer_flush(struct brw_context *brw,
    intel_upload_finish(brw);
 
    /* Check that we didn't just wrap our batchbuffer at a bad time. */
-   assert(!intel->no_batch_wrap);
+   assert(!brw->no_batch_wrap);
 
    ret = do_flush_locked(brw);
 

diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index f95b1db259759084c8ffb9ded83030a989ddee7a..d2eb7463bc2079920b2541bb13b8b7553c6e81e3 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -129,8 +129,6 @@ struct intel_context
    bool has_llc;
    bool has_swizzling;
 
-   bool no_batch_wrap;
-
    /**
     * Set if we're either a debug context or the INTEL_DEBUG=perf environment
     * variable is set, this is the flag indicating to do expensive work that