gallium: Redefine the max texture 2d cap from _LEVELS to _SIZE.

[mesa.git] / src / gallium / drivers / i915 / i915_blit.c

diff --git a/src/gallium/drivers/i915/i915_blit.c b/src/gallium/drivers/i915/i915_blit.c
index f885417f8ed7fc79adf11e9598ef1d84c6f02b8d..f20bf90d08d1c244996efdca1850a72dd30db767 100644 (file)
--- a/src/gallium/drivers/i915/i915_blit.c
+++ b/src/gallium/drivers/i915/i915_blit.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2003 VMware, Inc.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -50,7 +50,7 @@ i915_fill_blit(struct i915_context *i915,
             __FUNCTION__, dst_buffer, dst_pitch, dst_offset, x, y, w, h);
 
    if(!i915_winsys_validate_buffers(i915->batch, &dst_buffer, 1)) {
-      FLUSH_BATCH(NULL);
+      FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
       assert(i915_winsys_validate_buffers(i915->batch, &dst_buffer, 1));
    }
 
@@ -71,9 +71,9 @@ i915_fill_blit(struct i915_context *i915,
       return;
    }
 
-   if (!BEGIN_BATCH(6, 1)) {
-      FLUSH_BATCH(NULL);
-      assert(BEGIN_BATCH(6, 1));
+   if (!BEGIN_BATCH(6)) {
+      FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
+      assert(BEGIN_BATCH(6));
    }
    OUT_BATCH(CMD);
    OUT_BATCH(BR13);
@@ -111,7 +111,7 @@ i915_copy_blit(struct i915_context *i915,
             dst_buffer, dst_pitch, dst_offset, dst_x, dst_y, w, h);
 
    if(!i915_winsys_validate_buffers(i915->batch, buffers, 2)) {
-      FLUSH_BATCH(NULL);
+      FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
       assert(i915_winsys_validate_buffers(i915->batch, buffers, 2));
    }
 
@@ -143,9 +143,9 @@ i915_copy_blit(struct i915_context *i915,
     */
    assert (dst_pitch > 0 && src_pitch > 0);
 
-   if (!BEGIN_BATCH(8, 2)) {
-      FLUSH_BATCH(NULL);
-      assert(BEGIN_BATCH(8, 2));
+   if (!BEGIN_BATCH(8)) {
+      FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
+      assert(BEGIN_BATCH(8));
    }
    OUT_BATCH(CMD);
    OUT_BATCH(BR13);