Convert i915tex to the new interface and make it compile.

2 files changed, 7 insertions, 11 deletions

diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.c b/src/mesa/drivers/dri/common/dri_bufmgr.c
index fc2d4a0665..f60d3b0db6 100644
--- a/src/mesa/drivers/dri/common/dri_bufmgr.c
+++ b/src/mesa/drivers/dri/common/dri_bufmgr.c
@@ -86,6 +86,12 @@ dri_fence_validated(dri_bufmgr *bufmgr, const char *name, GLboolean flushed)
 }
 
 void
+dri_fence_wait(dri_fence *fence)
+{
+   fence->bufmgr->fence_wait(fence);
+}
+
+void
 dri_fence_reference(dri_fence *fence)
 {
    fence->bufmgr->fence_reference(fence);
diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.h b/src/mesa/drivers/dri/common/dri_bufmgr.h
index eafee88b88..62ed9d3821 100644
--- a/src/mesa/drivers/dri/common/dri_bufmgr.h
+++ b/src/mesa/drivers/dri/common/dri_bufmgr.h
@@ -164,17 +164,6 @@ struct _dri_bufmgr {
     */
 };
 
-/*
-extern void driBOData(struct _DriBufferObject *r_buf,
-                      unsigned size, const void *data, unsigned flags);
-extern void driBOSubData(struct _DriBufferObject *buf,
-                         unsigned long offset, unsigned long size,
-                         const void *data);
-extern void driBOGetSubData(struct _DriBufferObject *buf,
-                            unsigned long offset, unsigned long size,
-                            void *data);
-*/
-
 dri_bo *dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size,
 		     unsigned int alignment, unsigned int flags,
 		     unsigned int hint);
@@ -189,6 +178,7 @@ 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);