3 files changed, 11 insertions, 5 deletions
diff --git a/src/gallium/include/pipe/p_debug.h b/src/gallium/include/pipe/p_debug.h
index a5816c3cbb..6478ae2f08 100644
--- a/src/gallium/include/pipe/p_debug.h
+++ b/src/gallium/include/pipe/p_debug.h
@@ -332,13 +332,17 @@ debug_profile_stop(void);
 
 
 #ifdef DEBUG
+struct pipe_surface;
 void debug_dump_image(const char *prefix,
                       unsigned format, unsigned cpp,
                       unsigned width, unsigned height,
-                      unsigned pitch,
+                      unsigned stride,
                       const void *data);
+void debug_dump_surface(const char *prefix,
+                        struct pipe_surface *surface);   
 #else
-#define debug_dump_image(prefix, format, cpp, width, height, pitch, data) ((void)0)
+#define debug_dump_image(prefix, format, cpp, width, height, stride, data) ((void)0)
+#define debug_dump_surface(prefix, surface) ((void)0)
 #endif
 
 
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index 947c445583..d9aa5792a4 100644
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -28,11 +28,11 @@
 #ifndef PIPE_FORMAT_H
 #define PIPE_FORMAT_H
 
-#include "util/u_string.h"
-
 #include "p_compiler.h"
 #include "p_debug.h"
 
+#include "util/u_string.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -379,7 +379,7 @@ enum pipe_format {
 /**
  * Builds pipe format name from format token.
  */
-extern char *pf_sprint_name( char *str, enum pipe_format format );
+extern const char *pf_name( enum pipe_format format );
 
 /**
  * Return bits for a particular component.
diff --git a/src/gallium/include/pipe/p_winsys.h b/src/gallium/include/pipe/p_winsys.h
index 7ebc285192..5d18291dc6 100644
--- a/src/gallium/include/pipe/p_winsys.h
+++ b/src/gallium/include/pipe/p_winsys.h
@@ -62,6 +62,8 @@ struct pipe_surface;
  */
 struct pipe_winsys
 {
+   void (*destroy)( struct pipe_winsys *ws );
+
    /** Returns name of this winsys interface */
    const char *(*get_name)( struct pipe_winsys *ws );