From b65fcab046d3a1b6b6ac315720df220925c5322e Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 23 Oct 2018 06:36:00 +0000 Subject: Merge Mesa 17.3.9 Mesa 18.x needs an ld with build-id for at least the intel code Mesa 18.2 assumes linux only memfd syscalls in intel code Tested by matthieu@, kettenis@ and myself on a variety of hardware and architectures. ok kettenis@ --- lib/mesa/src/gallium/drivers/svga/svga_screen_cache.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/mesa/src/gallium/drivers/svga/svga_screen_cache.h') diff --git a/lib/mesa/src/gallium/drivers/svga/svga_screen_cache.h b/lib/mesa/src/gallium/drivers/svga/svga_screen_cache.h index 9365f751f..03b809a41 100644 --- a/lib/mesa/src/gallium/drivers/svga/svga_screen_cache.h +++ b/lib/mesa/src/gallium/drivers/svga/svga_screen_cache.h @@ -53,6 +53,7 @@ struct svga_winsys_surface; struct svga_screen; +struct svga_context; /** * Same as svga_winsys_screen::surface_create. @@ -105,7 +106,7 @@ struct svga_host_surface_cache_entry */ struct svga_host_surface_cache { - pipe_mutex mutex; + mtx_t mutex; /* Unused buffers are put in buckets to speed up lookups */ struct list_head bucket[SVGA_HOST_SURFACE_CACHE_BUCKETS]; @@ -136,6 +137,7 @@ svga_screen_cache_cleanup(struct svga_screen *svgascreen); void svga_screen_cache_flush(struct svga_screen *svgascreen, + struct svga_context *svga, struct pipe_fence_handle *fence); enum pipe_error @@ -145,6 +147,7 @@ svga_screen_cache_init(struct svga_screen *svgascreen); struct svga_winsys_surface * svga_screen_surface_create(struct svga_screen *svgascreen, unsigned bind_flags, enum pipe_resource_usage usage, + boolean *validated, struct svga_host_surface_cache_key *key); void -- cgit v1.2.3