import Mesa 11.0.6

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h b/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h
index 43a73830f..a3479eb0b 100644
--- a/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h
+++ b/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h
@@ -35,14 +35,16 @@
 #define SW_WINSYS_H
 
 
+#include "pipe/p_compiler.h" /* for boolean */
 #include "pipe/p_format.h"
-#include "state_tracker/winsys_handle.h"
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
+struct winsys_handle;
 struct pipe_screen;
 struct pipe_context;
 struct pipe_resource;
@@ -66,7 +68,7 @@ struct sw_winsys
    void 
    (*destroy)( struct sw_winsys *ws );
 
-   bool
+   boolean
    (*is_displaytarget_format_supported)( struct sw_winsys *ws,
                                          unsigned tex_usage,
                                          enum pipe_format format );
@@ -88,7 +90,6 @@ struct sw_winsys
                             enum pipe_format format,
                             unsigned width, unsigned height,
                             unsigned alignment,
-                            const void *front_private,
                             unsigned *stride );
 
    /**
@@ -103,7 +104,7 @@ struct sw_winsys
    /**
     * Used to implement texture_get_handle.
     */
-   bool
+   boolean
    (*displaytarget_get_handle)( struct sw_winsys *ws,
                                 struct sw_displaytarget *dt,
                                 struct winsys_handle *whandle );