Module: Mesa
Branch: main
Commit: ee8b572b4034bc4447df28f293d35d6382366f1e
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee8b572b4034bc4447df28f293d35d6382366f1e

Author: Michel Dänzer <[email protected]>
Date:   Tue Apr 25 18:14:16 2023 +0200

svga: Make vmw_svga_winsys_buffer_map definition match declaration

Pointed out by GCC 13:

../src/gallium/winsys/svga/drm/vmw_buffer.c:355:1: warning: conflicting types 
for ‘vmw_svga_winsys_buffer_map’ due to enum/integer mismatch; have ‘void 
*(struct svga_winsys_screen *, struct svga_winsys_buffer *, enum 
pipe_map_flags)’ [-Wenum-int-mismatch]
  355 | vmw_svga_winsys_buffer_map(struct svga_winsys_screen *sws,
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../src/gallium/winsys/svga/drm/vmw_buffer.c:52:
../src/gallium/winsys/svga/drm/vmw_buffer.h:82:1: note: previous declaration of 
‘vmw_svga_winsys_buffer_map’ with type ‘void *(struct svga_winsys_screen *, 
struct svga_winsys_buffer *, unsigned int)’
   82 | vmw_svga_winsys_buffer_map(struct svga_winsys_screen *sws,
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22718>

---

 src/gallium/winsys/svga/drm/vmw_buffer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/winsys/svga/drm/vmw_buffer.h 
b/src/gallium/winsys/svga/drm/vmw_buffer.h
index 9e452e7e807..99ffca2de05 100644
--- a/src/gallium/winsys/svga/drm/vmw_buffer.h
+++ b/src/gallium/winsys/svga/drm/vmw_buffer.h
@@ -81,7 +81,7 @@ vmw_svga_winsys_buffer_destroy(struct svga_winsys_screen *sws,
 void *
 vmw_svga_winsys_buffer_map(struct svga_winsys_screen *sws,
                            struct svga_winsys_buffer *buf,
-                           unsigned flags);
+                           enum pipe_map_flags flags);
 
 void
 vmw_svga_winsys_buffer_unmap(struct svga_winsys_screen *sws,

Reply via email to