Mesa (main): zink: drop getenv hacking now that gallium is fixed.

[GitLab Mirror]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jun 30 05:25:10 2021 +1000

zink: drop getenv hacking now that gallium is fixed.

This drops the getenv hacks which cause problems testing multithread apps

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11643>

---

 src/gallium/drivers/zink/zink_screen.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index c025bc746e5..6e117506d95 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1787,35 +1787,10 @@ fail:
 struct pipe_screen *
 zink_create_screen(struct sw_winsys *winsys)
 {
-#ifdef ZINK_WITH_SWRAST_VK
-   char *use_lavapipe = getenv("ZINK_USE_LAVAPIPE");
-   if (use_lavapipe) {
-      /**
-      * HACK: unset $GALLIUM_DRIVER to prevent Lavapipe from
-      * recursively trying to use zink as the gallium driver.
-      *
-      * This is not thread-safe, so if an application creates another
-      * context in another thread at the same time, it may or may not use zink,
-      * but at least it won't abort.
-      */
-#ifdef _WIN32
-      _putenv("GALLIUM_DRIVER=llvmpipe");
-#else
-      setenv("GALLIUM_DRIVER", "llvmpipe", 1);
-#endif
-   }
-#endif
-
    struct zink_screen *ret = zink_internal_create_screen(NULL);
    if (ret)
       ret->winsys = winsys;
 
-#ifdef ZINK_WITH_SWRAST_VK
-   if (use_lavapipe) {
-      printf("zink running on lavapipe: if you see VK_ERROR_OUT_OF_HOST_MEMORY from lavapipe, try again.\n");
-   }
-#endif
-
    return &ret->base;
 }