Import Mesa 19.2.8

3 files changed, 17 insertions, 7 deletions

diff --git a/lib/mesa/src/gallium/include/state_tracker/graw.h b/lib/mesa/src/gallium/include/state_tracker/graw.h
index 78ddf0a87..af81cc887 100644
--- a/lib/mesa/src/gallium/include/state_tracker/graw.h
+++ b/lib/mesa/src/gallium/include/state_tracker/graw.h
@@ -79,7 +79,7 @@ PUBLIC void *graw_parse_fragment_shader( struct pipe_context *pipe,
  * If an option has been successfully parsed, argi is updated
  * to point just after the option and return TRUE.
  */
-PUBLIC boolean graw_parse_args(int *argi, int argc, char *argv[]);
+PUBLIC bool graw_parse_args(int *argi, int argc, char *argv[]);
 
 /* Saves surface contents to a file.
  *
@@ -89,8 +89,8 @@ PUBLIC boolean graw_parse_args(int *argi, int argc, char *argv[]);
  *
  * Returns TRUE if the surface has been saved.
  */
-PUBLIC boolean graw_save_surface_to_file(struct pipe_context *pipe,
-                                         struct pipe_surface *surface,
-                                         const char *filename);
+PUBLIC bool graw_save_surface_to_file(struct pipe_context *pipe,
+                                      struct pipe_surface *surface,
+                                      const char *filename);
 
 #endif
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 cd5838ad1..43a73830f 100644
--- a/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h
+++ b/lib/mesa/src/gallium/include/state_tracker/sw_winsys.h
@@ -35,7 +35,6 @@
 #define SW_WINSYS_H
 
 
-#include "pipe/p_compiler.h" /* for boolean */
 #include "pipe/p_format.h"
 #include "state_tracker/winsys_handle.h"
 
@@ -67,7 +66,7 @@ struct sw_winsys
    void 
    (*destroy)( struct sw_winsys *ws );
 
-   boolean
+   bool
    (*is_displaytarget_format_supported)( struct sw_winsys *ws,
                                          unsigned tex_usage,
                                          enum pipe_format format );
@@ -104,7 +103,7 @@ struct sw_winsys
    /**
     * Used to implement texture_get_handle.
     */
-   boolean
+   bool
    (*displaytarget_get_handle)( struct sw_winsys *ws,
                                 struct sw_displaytarget *dt,
                                 struct winsys_handle *whandle );
diff --git a/lib/mesa/src/gallium/include/state_tracker/winsys_handle.h b/lib/mesa/src/gallium/include/state_tracker/winsys_handle.h
index 167c1a937..78f5f4b36 100644
--- a/lib/mesa/src/gallium/include/state_tracker/winsys_handle.h
+++ b/lib/mesa/src/gallium/include/state_tracker/winsys_handle.h
@@ -29,6 +29,11 @@ struct winsys_handle
     */
    unsigned layer;
    /**
+    * Input for texture_get_handle, allows to export of a specific plane of a
+    * texture.
+    */
+   unsigned plane;
+   /**
     * Input to texture_from_handle.
     * Output for texture_get_handle.
     */
@@ -48,6 +53,12 @@ struct winsys_handle
     * Input to resource_from_handle.
     * Output from resource_get_handle.
     */
+   uint64_t format;
+
+   /**
+    * Input to resource_from_handle.
+    * Output from resource_get_handle.
+    */
    uint64_t modifier;
 };