gl: updated glxext.h to version 27

[mesa.git] / src / gallium / winsys / drm / radeon / core / radeon_buffer.h

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_buffer.h b/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
index f5153b06af535aae6c8a046ed95139c57a74134b..f776e2d90085eebe4d259c054b83d4fd45486c61 100644 (file)
--- a/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
+++ b/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
@@ -30,24 +30,19 @@
 #ifndef RADEON_BUFFER_H
 #define RADEON_BUFFER_H
 
-#include <stdio.h>
-
-#include "pipe/internal/p_winsys_screen.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_inlines.h"
-
-//#include "state_tracker/st_public.h"
-
-#include "util/u_memory.h"
+#include "pipebuffer/pb_buffer.h"
 
 #include "radeon_bo.h"
 #include "radeon_cs.h"
 
-#include "radeon_drm.h"
+#include "radeon_winsys.h"
 
 struct radeon_pipe_buffer {
     struct pipe_buffer  base;
+    /* Pointer to GPU-backed BO. */
     struct radeon_bo    *bo;
+    /* Pointer to fallback PB buffer. */
+    struct pb_buffer    *pb;
     boolean flinked;
     uint32_t flink;
 };
@@ -66,14 +61,10 @@ struct radeon_winsys_priv {
 
     /* Current CS. */
     struct radeon_cs* cs;
-};
-
-struct radeon_winsys {
-    /* Parent class. */
-    struct pipe_winsys base;
 
-    /* This corresponds to void* radeon_winsys in r300_winsys. */
-    struct radeon_winsys_priv* priv;
+    /* Flush CB */
+    void (*flush_cb)(void *);
+    void *flush_data;
 };
 
 struct radeon_winsys* radeon_pipe_winsys(int fb);