Module: Mesa
Branch: master
Commit: 834b69d1ef4bf73293b8a0d6c85e4dd19ac029b6
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=834b69d1ef4bf73293b8a0d6c85e4dd19ac029b6

Author: Michel Zou <[email protected]>
Date:   Thu Feb 18 09:19:30 2021 +0100

zink: fix win32 build

Fixes: 57575627, c4cc3d91

Tested-by: Prodea Alexandru-Liviu <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9126>

---

 src/gallium/drivers/zink/zink_screen.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_screen.c 
b/src/gallium/drivers/zink/zink_screen.c
index f7add463f53..7ec0c16be6e 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -808,8 +808,10 @@ zink_destroy_screen(struct pipe_screen *pscreen)
 
    u_transfer_helper_destroy(pscreen->transfer_helper);
    zink_screen_update_pipeline_cache(screen);
+#ifdef ENABLE_SHADER_CACHE
    if (screen->disk_cache)
       disk_cache_wait_for_idle(screen->disk_cache);
+#endif
    disk_cache_destroy(screen->disk_cache);
    vkDestroyPipelineCache(screen->dev, screen->pipeline_cache, NULL);
 
@@ -1287,8 +1289,10 @@ zink_internal_create_screen(const struct 
pipe_screen_config *config)
 
    slab_create_parent(&screen->transfer_pool, sizeof(struct zink_transfer), 
16);
 
+#if WITH_XMLCONFIG
    if (config)
       screen->driconf.dual_color_blend_by_location = 
driQueryOptionb(config->options, "dual_color_blend_by_location");
+#endif
 
    return screen;
 

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to