Squashed commit of the following:

[mesa.git] / src / mesa / state_tracker / st_public.h

diff --git a/src/mesa/state_tracker/st_public.h b/src/mesa/state_tracker/st_public.h
index 98c19817c87fb6ef874e16854f6b4bcbf9479a74..18f82132b9f31a7a974018ad9e03f868c881cca7 100644 (file)
--- a/src/mesa/state_tracker/st_public.h
+++ b/src/mesa/state_tracker/st_public.h
@@ -34,12 +34,12 @@
 #include "pipe/p_compiler.h"
 #include "pipe/p_format.h"
 
-
+/** Renderbuffer surfaces (should match Mesa names) */
 #define ST_SURFACE_FRONT_LEFT   0
 #define ST_SURFACE_BACK_LEFT    1
 #define ST_SURFACE_FRONT_RIGHT  2
 #define ST_SURFACE_BACK_RIGHT   3
-#define ST_SURFACE_DEPTH        8
+#define ST_SURFACE_DEPTH        4
 
 #define ST_TEXTURE_2D    0x2
 #define ST_TEXTURE_RECT  0x4
@@ -53,7 +53,7 @@ struct st_framebuffer;
 struct pipe_context;
 struct pipe_fence_handle;
 struct pipe_surface;
-struct pipe_texture;
+struct pipe_resource;
 
 
 PUBLIC
@@ -94,7 +94,7 @@ int st_get_framebuffer_surface(struct st_framebuffer *stfb,
 
 PUBLIC
 int st_get_framebuffer_texture(struct st_framebuffer *stfb,
-                               uint surfIndex, struct pipe_texture **texture);
+                               uint surfIndex, struct pipe_resource **texture);
 
 PUBLIC
 void *st_framebuffer_private( struct st_framebuffer *stfb );
@@ -105,7 +105,8 @@ void st_unreference_framebuffer( struct st_framebuffer *stfb );
 PUBLIC
 GLboolean st_make_current(struct st_context *st,
                           struct st_framebuffer *draw,
-                          struct st_framebuffer *read);
+                          struct st_framebuffer *read,
+                          void *winsys_drawable_handle);
 
 PUBLIC
 struct st_context *st_get_current(void);