From e363ab4607e5696de86c6ade26850cabb0301b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 25 Apr 2023 18:14:16 +0200 Subject: [PATCH] svga: Make vmw_svga_winsys_buffer_map definition match declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: (cherry picked from commit ee8b572b4034bc4447df28f293d35d6382366f1e) --- .pick_status.json | 2 +- src/gallium/winsys/svga/drm/vmw_buffer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index be40fbf8c2c..fe37cb69852 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1525,7 +1525,7 @@ "description": "svga: Make vmw_svga_winsys_buffer_map definition match declaration", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, 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,