Merge Mesa 21.1.5

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c b/lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c
index fb0bee778..9cf5ad609 100644
--- a/lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c
+++ b/lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c
@@ -37,6 +37,7 @@
 #include "svga_cmd.h"
 #include "svga3d_caps.h"
 
+#include "util/os_file.h"
 #include "util/u_inlines.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
@@ -143,7 +144,7 @@ vmw_svga_winsys_fence_get_fd(struct svga_winsys_screen *sws,
                              boolean duplicate)
 {
    if (duplicate)
-      return dup(vmw_fence_get_fd(fence));
+      return os_dupfd_cloexec(vmw_fence_get_fd(fence));
    else
       return vmw_fence_get_fd(fence);
 }
@@ -154,7 +155,7 @@ vmw_svga_winsys_fence_create_fd(struct svga_winsys_screen *sws,
                                 struct pipe_fence_handle **fence,
                                 int32_t fd)
 {
-   *fence = vmw_fence_create(NULL, 0, 0, 0, dup(fd));
+   *fence = vmw_fence_create(NULL, 0, 0, 0, os_dupfd_cloexec(fd));
 }
 
 static int
@@ -431,7 +432,7 @@ vmw_svga_winsys_shader_create(struct svga_winsys_screen *sws,
    if (!shader->buf)
       goto out_no_buf;
 
-   code = vmw_svga_winsys_buffer_map(sws, shader->buf, PIPE_TRANSFER_WRITE);
+   code = vmw_svga_winsys_buffer_map(sws, shader->buf, PIPE_MAP_WRITE);
    if (!code)
       goto out_no_buf;
 
@@ -495,6 +496,7 @@ vmw_winsys_screen_init_svga(struct vmw_winsys_screen *vws)
    vws->base.buffer_map = vmw_svga_winsys_buffer_map;
    vws->base.buffer_unmap = vmw_svga_winsys_buffer_unmap;
    vws->base.buffer_destroy = vmw_svga_winsys_buffer_destroy;
+   vws->base.surface_init = vmw_svga_winsys_surface_init;
    vws->base.fence_reference = vmw_svga_winsys_fence_reference;
    vws->base.fence_signalled = vmw_svga_winsys_fence_signalled;
    vws->base.shader_create = vmw_svga_winsys_shader_create;