X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fcommon%2Fdri_bufmgr.h;h=7dbb558949aff60136b51bcec4d343da842a504c;hb=ea2278bc793670d4b7922131d1638f2446c896e0;hp=6aac54b7f42922e13df917781a2006e0f666e36c;hpb=4fe48b4e8568896cdbc822323aeec0a41c72ff2a;p=mesa.git

diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.h b/src/mesa/drivers/dri/common/dri_bufmgr.h
index 6aac54b7f42..7dbb558949a 100644
--- a/src/mesa/drivers/dri/common/dri_bufmgr.h
+++ b/src/mesa/drivers/dri/common/dri_bufmgr.h
@@ -116,30 +116,6 @@ struct _dri_bufmgr {
    /** Reduces the refcount on the userspace mapping of the buffer object. */
    int (*bo_unmap)(dri_bo *buf);
 
-   /**
-    * Makes the buffer accessible to the graphics chip.
-    *
-    * The resulting offset of the buffer within the graphics aperture is then
-    * available at buf->offset until the buffer is fenced.
-    *
-    * Flags should consist of the memory types that the buffer may be validated
-    * into and the read/write/exe flags appropriate to the use of the buffer.
-    */
-   int (*bo_validate)(dri_bo *buf, unsigned int flags);
-
-   /**
-    * Associates the current set of validated buffers with a fence.
-    *
-    * Once fenced, the buffer manager will allow the validated buffers to be
-    * evicted when the graphics device's execution has passed the fence
-    * command.
-    *
-    * The fence object will have flags for the sum of the read/write/exe flags
-    * of the validated buffers associated with it.
-    */
-   dri_fence * (*fence_validated)(dri_bufmgr *bufmgr, const char *name,
-				  GLboolean flushed);
-
    /** Takes a reference on a fence object */
    void (*fence_reference)(dri_fence *fence);
 
@@ -155,8 +131,18 @@ struct _dri_bufmgr {
    void (*fence_wait)(dri_fence *fence);
 
    /**
-    * Checks and returns whether the given fence is signaled.
+    * Tears down the buffer manager instance.
+    */
+   void (*destroy)(dri_bufmgr *bufmgr);
+   
+   /**
+    * Add relocation
     */
+   void (*emit_reloc)(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, dri_bo *relocatee);
+
+  void *(*process_relocs)(dri_bo *batch_buf, GLuint *count);
+
+   void (*post_submit)(dri_bo *batch_buf, dri_fence **fence);
 };
 
 dri_bo *dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size,
@@ -168,9 +154,6 @@ void dri_bo_reference(dri_bo *bo);
 void dri_bo_unreference(dri_bo *bo);
 int dri_bo_map(dri_bo *buf, GLboolean write_enable);
 int dri_bo_unmap(dri_bo *buf);
-int dri_bo_validate(dri_bo *buf, unsigned int flags);
-dri_fence *dri_fence_validated(dri_bufmgr *bufmgr, const char *name,
-			       GLboolean flushed);
 void dri_fence_wait(dri_fence *fence);
 void dri_fence_reference(dri_fence *fence);
 void dri_fence_unreference(dri_fence *fence);
@@ -190,6 +173,12 @@ dri_bufmgr *dri_bufmgr_fake_init(unsigned long low_offset, void *low_virtual,
 				 int (*fence_wait)(void *private,
 						   unsigned int cookie),
 				 void *driver_priv);
-void dri_bufmgr_fake_contended_lock_take(dri_bufmgr *bufmgr);
-
+void dri_bufmgr_destroy(dri_bufmgr *bufmgr);
+dri_bo *dri_ttm_bo_create_from_handle(dri_bufmgr *bufmgr, const char *name,
+				      unsigned int handle);
+
+void dri_emit_reloc(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, dri_bo *relocatee);
+void *dri_process_relocs(dri_bo *batch_buf, uint32_t *count);
+void dri_post_process_relocs(dri_bo *batch_buf);
+void dri_post_submit(dri_bo *batch_buf, dri_fence **last_fence);
 #endif