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 14c463d702cb31f0a0d02e8efc76fa674354a91c..f776e2d90085eebe4d259c054b83d4fd45486c61 100644 (file)
--- a/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
+++ b/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
@@ -1,7 +1,7 @@
-/* 
+/*
  * Copyright © 2008 Jérôme Glisse
  * All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -9,14 +9,14 @@
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * 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 THE COPYRIGHT HOLDERS, AUTHORS
  * 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 
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * The above copyright notice and this permission notice (including the
@@ -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;
 };
@@ -61,24 +56,15 @@ struct radeon_winsys_priv {
     /* Radeon BO manager. */
     struct radeon_bo_manager* bom;
 
-    /* Radeon BO space checker. */
-    struct radeon_cs_space_check sc[RADEON_MAX_BOS];
-    /* Current BO count. */
-    unsigned bo_count;
-
     /* Radeon CS manager. */
     struct radeon_cs_manager* csm;
 
     /* 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);