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

[mesa.git] / src / gallium / drivers / i915 / i915_batchbuffer.h

diff --git a/src/gallium/drivers/i915/i915_batchbuffer.h b/src/gallium/drivers/i915/i915_batchbuffer.h
index 27ccaa6b1fa7b30ca7e2898115adf943663d5f6f..6466fa594f9021d0313ae4a1653cd42a5876cfc3 100644 (file)
--- a/src/gallium/drivers/i915/i915_batchbuffer.h
+++ b/src/gallium/drivers/i915/i915_batchbuffer.h
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 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.
@@ -29,59 +29,75 @@
 #define I915_BATCHBUFFER_H
 
 #include "i915_winsys.h"
+#include "util/u_debug.h"
 
-static INLINE boolean
-i915_winsys_batchbuffer_check(struct i915_winsys_batchbuffer *batch,
-                              size_t dwords,
-                              size_t relocs)
-{
-   return dwords * 4 <= batch->size - (batch->ptr - batch->map) &&
-          relocs <= (batch->max_relocs - batch->relocs);
-}
+struct i915_context;
 
-static INLINE size_t
+static inline size_t
 i915_winsys_batchbuffer_space(struct i915_winsys_batchbuffer *batch)
 {
    return batch->size - (batch->ptr - batch->map);
 }
 
-static INLINE void
-i915_winsys_batchbuffer_dword(struct i915_winsys_batchbuffer *batch,
-                              unsigned dword)
+static inline boolean
+i915_winsys_batchbuffer_check(struct i915_winsys_batchbuffer *batch,
+                              size_t dwords)
 {
-   if (i915_winsys_batchbuffer_space(batch) < 4)
-      return;
+   return dwords * 4 <= i915_winsys_batchbuffer_space(batch);
+}
 
+static inline void
+i915_winsys_batchbuffer_dword_unchecked(struct i915_winsys_batchbuffer *batch,
+                                        unsigned dword)
+{
    *(unsigned *)batch->ptr = dword;
    batch->ptr += 4;
 }
 
-static INLINE void
+static inline void
+i915_winsys_batchbuffer_float(struct i915_winsys_batchbuffer *batch,
+                              float f)
+{
+   union { float f; unsigned int ui; } uif;
+   uif.f = f;
+   assert (i915_winsys_batchbuffer_space(batch) >= 4);
+   i915_winsys_batchbuffer_dword_unchecked(batch, uif.ui);
+}
+
+static inline void
+i915_winsys_batchbuffer_dword(struct i915_winsys_batchbuffer *batch,
+                              unsigned dword)
+{
+   assert (i915_winsys_batchbuffer_space(batch) >= 4);
+   i915_winsys_batchbuffer_dword_unchecked(batch, dword);
+}
+
+static inline void
 i915_winsys_batchbuffer_write(struct i915_winsys_batchbuffer *batch,
-                       void *data,
-                       size_t size)
+                              void *data,
+                              size_t size)
 {
-   if (i915_winsys_batchbuffer_space(batch) < size)
-      return;
+   assert (i915_winsys_batchbuffer_space(batch) >= size);
 
-   memcpy(data, batch->ptr, size);
+   memcpy(batch->ptr, data, size);
    batch->ptr += size;
 }
 
-static INLINE int
-i915_winsys_batchbuffer_reloc(struct i915_winsys_batchbuffer *batch,
-                              struct i915_winsys_buffer *buffer,
-                              enum i915_winsys_buffer_usage usage,
-                              size_t offset)
+static inline boolean
+i915_winsys_validate_buffers(struct i915_winsys_batchbuffer *batch,
+                             struct i915_winsys_buffer **buffers,
+                             int num_of_buffers)
 {
-   return batch->iws->batchbuffer_reloc(batch, buffer, usage, offset);
+   return batch->iws->validate_buffers(batch, buffers, num_of_buffers);
 }
 
-static INLINE void
-i915_winsys_batchbuffer_flush(struct i915_winsys_batchbuffer *batch,
-                              struct pipe_fence_handle **fence)
+static inline int
+i915_winsys_batchbuffer_reloc(struct i915_winsys_batchbuffer *batch,
+                              struct i915_winsys_buffer *buffer,
+                              enum i915_winsys_buffer_usage usage,
+                              size_t offset, boolean fenced)
 {
-   batch->iws->batchbuffer_flush(batch, fence);
+   return batch->iws->batchbuffer_reloc(batch, buffer, usage, offset, fenced);
 }
 
 #endif