KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: remove unused headers/struct members/linkage 

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16252>
This commit is contained in:
Mike Blumenkrantz 2022-04-29 07:26:09 -04:00 committed by Marge Bot
parent fd75be7986
commit d474229ed1
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/zink/meson.build
View File

@ -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,
)

3
src/gallium/drivers/zink/zink_resource.c
View File

@ -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 */

5
src/gallium/drivers/zink/zink_screen.c
View File

@ -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;
}

5
src/gallium/drivers/zink/zink_screen.h
View File

@ -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;