Mesa (main): zink: Drop useless zink_dispatch_table
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jun 14 20:15:38 UTC 2021
Module: Mesa
Branch: main
Commit: d31ea71c44d7d65ed17c1a2842c274b6f9cd8e99
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d31ea71c44d7d65ed17c1a2842c274b6f9cd8e99
Author: Michel Zou <xantares09 at hotmail.com>
Date: Sun Jun 13 19:36:53 2021 +0200
zink: Drop useless zink_dispatch_table
Reviewed-by: Hoe Hao Cheng <haochengho12907 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11338>
---
src/gallium/drivers/zink/meson.build | 14 +-------------
src/gallium/drivers/zink/zink_screen.h | 2 +-
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build
index 8a7c02e404f..cd2f71e1ed4 100644
--- a/src/gallium/drivers/zink/meson.build
+++ b/src/gallium/drivers/zink/meson.build
@@ -73,18 +73,6 @@ zink_nir_algebraic_c = custom_target(
depend_files : nir_algebraic_py,
)
-zink_dispatch_table = custom_target(
- 'zink_dispatch_table.c',
- input : join_paths(meson.source_root(), 'src/vulkan/util/vk_dispatch_table_gen.py'),
- output : ['zink_dispatch_table.h', 'zink_dispatch_table.c'],
- command : [
- prog_python, '@INPUT@',
- '--xml', join_paths(meson.source_root(), 'src/vulkan/registry/vk.xml'),
- '--out-h', '@OUTPUT0@',
- '--out-c', '@OUTPUT1@',
- ],
-)
-
zink_c_args = []
inc_zink_vk = []
@@ -101,7 +89,7 @@ endif
libzink = static_library(
'zink',
- [files_libzink, zink_device_info, zink_instance, zink_nir_algebraic_c, zink_dispatch_table],
+ [files_libzink, zink_device_info, zink_instance, zink_nir_algebraic_c, vk_dispatch_table],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_wsi, inc_vulkan_util, inc_zink_vk],
dependencies: [dep_vulkan, idep_nir_headers, idep_mesautil],
diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index 8008b39f5d4..a4a35183299 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -26,7 +26,7 @@
#include "zink_device_info.h"
#include "zink_instance.h"
-#include "zink_dispatch_table.h"
+#include "vk_dispatch_table.h"
#include "util/u_idalloc.h"
#include "pipe/p_screen.h"
More information about the mesa-commit
mailing list