i915: Removed useless defines

diff --git a/src/gallium/drivers/i915simple/i915_batch.h b/src/gallium/drivers/i915simple/i915_batch.h
index 9379d1f..987d0b4 100644 (file)
--- a/src/gallium/drivers/i915simple/i915_batch.h
+++ b/src/gallium/drivers/i915simple/i915_batch.h
@@ -100,8 +100,6 @@ i915_batchbuffer_flush( struct i915_batchbuffer *batch,
    batch->winsys->batch_flush( batch->winsys, fence );
 }
 
-#define BATCH_LOCALS
-
 #define BEGIN_BATCH( dwords, relocs ) \
    (i915_batchbuffer_check( i915->batch, dwords, relocs ))
 
@@ -111,8 +109,6 @@ i915_batchbuffer_flush( struct i915_batchbuffer *batch,
 #define OUT_RELOC( buf, flags, delta ) \
    i915_batchbuffer_reloc( i915->batch, buf, flags, delta )
 
-#define ADVANCE_BATCH()
-
 #define FLUSH_BATCH(fence) do {                        \
    if (0) i915_dump_batchbuffer( i915 );               \
    i915->winsys->batch_flush( i915->winsys, fence );   \

diff --git a/src/gallium/drivers/i915simple/i915_blit.c b/src/gallium/drivers/i915simple/i915_blit.c
index 24449e3..b500ff3 100644 (file)
--- a/src/gallium/drivers/i915simple/i915_blit.c
+++ b/src/gallium/drivers/i915simple/i915_blit.c
@@ -45,7 +45,6 @@ i915_fill_blit(struct i915_context *i915,
               unsigned color)
 {
    unsigned BR13, CMD;
-   BATCH_LOCALS;
 
    dst_pitch *= (short) cpp;
 
@@ -79,7 +78,6 @@ i915_fill_blit(struct i915_context *i915,
    OUT_BATCH(((y + h) << 16) | (x + w));
    OUT_RELOC( dst_buffer, I915_BUFFER_ACCESS_WRITE, dst_offset);
    OUT_BATCH(color);
-   ADVANCE_BATCH();
 }
 
 
@@ -100,7 +98,6 @@ i915_copy_blit( struct i915_context *i915,
    unsigned CMD, BR13;
    int dst_y2 = dst_y + h;
    int dst_x2 = dst_x + w;
-   BATCH_LOCALS;
 
 
    I915_DBG(i915,
@@ -156,7 +153,6 @@ i915_copy_blit( struct i915_context *i915,
    OUT_BATCH((src_y << 16) | src_x);
    OUT_BATCH(((int) src_pitch & 0xffff));
    OUT_RELOC(src_buffer, I915_BUFFER_ACCESS_READ, src_offset);
-   ADVANCE_BATCH();
 }
 
 

diff --git a/src/gallium/drivers/i915simple/i915_flush.c b/src/gallium/drivers/i915simple/i915_flush.c
index 4c4718d..472e0ab 100644 (file)
--- a/src/gallium/drivers/i915simple/i915_flush.c
+++ b/src/gallium/drivers/i915simple/i915_flush.c
@@ -62,7 +62,6 @@ static void i915_flush( struct pipe_context *pipe,
         assert(BEGIN_BATCH(1, 0));
       }
       OUT_BATCH( flush );
-      ADVANCE_BATCH();
    }
 
    /* If there are no flags, just flush pending commands to hardware: