Mesa (main): zink: remove unused headers/struct members/linkage

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Apr 29 07:26:09 2022 -0400

zink: remove unused headers/struct members/linkage

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16252>

---

 src/gallium/drivers/zink/meson.build     | 2 +-
 src/gallium/drivers/zink/zink_resource.c | 3 +--
 src/gallium/drivers/zink/zink_screen.c   | 5 -----
 src/gallium/drivers/zink/zink_screen.h   | 5 -----
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build
index 21634ba2a94..78591430be8 100644
--- a/src/gallium/drivers/zink/meson.build
+++ b/src/gallium/drivers/zink/meson.build
@@ -92,7 +92,7 @@ libzink = static_library(
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_util, inc_zink_vk],
   dependencies: [
     dep_vulkan, idep_nir_headers, idep_mesautil, idep_vulkan_util_headers,
-    idep_vulkan_wsi_headers, dep_libdrm, idep_vulkan_util
+    idep_vulkan_wsi_headers, idep_vulkan_util
   ],
   c_args: zink_c_args,
 )
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 5efb8daa59b..5e427fc48ae 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -45,14 +45,13 @@
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
 #include "util/os_file.h"
-#include "frontend/sw_winsys.h"
+#include "frontend/winsys_handle.h"
 
 #if !defined(_WIN32) && !defined(__APPLE__)
 #define ZINK_USE_DMABUF
 #endif
 
 #ifdef ZINK_USE_DMABUF
-#include <xf86drm.h>
 #include "drm-uapi/drm_fourcc.h"
 #else
 /* these won't actually be used */
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 3bee0174a8e..6bce401d2b9 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -53,8 +53,6 @@
 
 #include "driver_trace/tr_context.h"
 
-#include "frontend/sw_winsys.h"
-
 #if DETECT_OS_WINDOWS
 #include <io.h>
 #else
@@ -2239,9 +2237,6 @@ struct pipe_screen *
 zink_create_screen(struct sw_winsys *winsys, const struct pipe_screen_config *config)
 {
    struct zink_screen *ret = zink_internal_create_screen(config);
-   if (ret) {
-      ret->sw_winsys = winsys;
-   }
 
    return &ret->base;
 }
diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index ebad3c45281..ad350040b06 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -40,8 +40,6 @@
 #include "util/u_vertex_state_cache.h"
 #include "pipebuffer/pb_cache.h"
 #include "pipebuffer/pb_slab.h"
-#include "frontend/sw_winsys.h"
-#include "kopper_interface.h"
 
 #include <vulkan/vulkan.h>
 
@@ -94,9 +92,6 @@ struct zink_screen {
    simple_mtx_t dt_lock;
 
    bool device_lost;
-   struct sw_winsys winsys;
-   struct sw_winsys *sw_winsys; // wrapped
-   __DRIkopperLoaderExtension *loader;
 
    struct hash_table framebuffer_cache;