i915: Remove state batch emit support.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.c b/src/mesa/drivers/dri/i915/intel_batchbuffer.c
index e40ba5607a95183cc96d498fe2228418fe548efb..1857fea28dd85a46852401e917f60a2b46db7733 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.c
@@ -57,7 +57,6 @@ intel_batchbuffer_reset(struct intel_context *intel)
                                        intel->maxBatchSize, 4096);
 
    intel->batch.reserved_space = BATCH_RESERVED;
-   intel->batch.state_batch_offset = intel->batch.bo->size;
    intel->batch.used = 0;
 }
 
@@ -118,12 +117,6 @@ do_flush_locked(struct intel_context *intel)
    int ret = 0;
 
    ret = drm_intel_bo_subdata(batch->bo, 0, 4*batch->used, batch->map);
-   if (ret == 0 && batch->state_batch_offset != batch->bo->size) {
-      ret = drm_intel_bo_subdata(batch->bo,
-                                 batch->state_batch_offset,
-                                 batch->bo->size - batch->state_batch_offset,
-                                 (char *)batch->map + batch->state_batch_offset);
-   }
 
    if (!intel->intelScreen->no_hw) {
       if (ret == 0) {

diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.h b/src/mesa/drivers/dri/i915/intel_batchbuffer.h
index 3017d388efaf8ad22bc871ecee88a04ff7b33619..ede177312fee1c2c80199f7338a0b7bb81bbb7d7 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_batchbuffer.h
+++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.h
@@ -73,7 +73,7 @@ static INLINE uint32_t float_as_int(float f)
 static INLINE unsigned
 intel_batchbuffer_space(struct intel_context *intel)
 {
-   return (intel->batch.state_batch_offset - intel->batch.reserved_space)
+   return (intel->batch.bo->size - intel->batch.reserved_space)
       - intel->batch.used*4;
 }
 

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index fffd21ebd7b15ba09f06440dc26bf4858c50fe4e..1b4798f6ec14ba664a822191c4c47eb6ef5bb31d 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -127,8 +127,6 @@ struct intel_batchbuffer {
    uint32_t *map;
    uint32_t *cpu_map;
 #define BATCH_SZ (8192*sizeof(uint32_t))
-
-   uint32_t state_batch_offset;
 };
 
 /**