/**************************************************************************
*
- * 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
* 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.
#define OUT_RELOC_FENCED(buf, usage, offset) \
i915_winsys_batchbuffer_reloc(i915->batch, buf, usage, offset, true)
-#define FLUSH_BATCH(fence) \
- i915_flush(i915, fence)
+#define FLUSH_BATCH(fence, flags) \
+ i915_flush(i915, fence, flags)
/************************************************************************
* i915_flush.c
*/
-void i915_flush(struct i915_context *i915, struct pipe_fence_handle **fence);
-
-/*
- * Flush if the current color buf is idle and we have more than 256 vertices
- * queued, or if the current color buf is busy and we have more than 4096
- * vertices queued.
- */
-static INLINE void i915_flush_heuristically(struct i915_context* i915,
- int num_vertex)
-{
- struct i915_winsys *iws = i915->iws;
-
- i915->queued_vertices += num_vertex;
-
- /* fire if we have more than 1/20th of the last frame's vertices */
- if (i915->queued_vertices > i915->last_fired_vertices / 20) {
- FLUSH_BATCH(NULL);
- i915->fired_vertices += i915->queued_vertices;
- i915->queued_vertices = 0;
- return;
- }
-}
-
+extern void i915_flush(struct i915_context *i915,
+ struct pipe_fence_handle **fence,
+ unsigned flags);
#endif