Mesa (master): zink: factor out GET_PROC_ADDR and friends to zink_screen.h
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Dec 11 12:18:08 UTC 2020
Module: Mesa
Branch: master
Commit: 12656de341a778dd4b9fbdd753421b8e4b010510
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=12656de341a778dd4b9fbdd753421b8e4b010510
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Dec 2 17:28:06 2020 -0500
zink: factor out GET_PROC_ADDR and friends to zink_screen.h
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7800>
---
src/gallium/drivers/zink/zink_screen.c | 18 ------------------
src/gallium/drivers/zink/zink_screen.h | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 68938f16fa7..24a57ad5462 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -54,24 +54,6 @@ DEBUG_GET_ONCE_FLAGS_OPTION(zink_debug, "ZINK_DEBUG", debug_options, 0)
uint32_t
zink_debug;
-#define GET_PROC_ADDR(x) do { \
- screen->vk_##x = (PFN_vk##x)vkGetDeviceProcAddr(screen->dev, "vk"#x); \
- if (!screen->vk_##x) { \
- debug_printf("vkGetDeviceProcAddr failed: vk"#x"\n"); \
- return false; \
- } \
- } while (0)
-
-#define GET_PROC_ADDR_INSTANCE(x) do { \
- screen->vk_##x = (PFN_vk##x)vkGetInstanceProcAddr(screen->instance, "vk"#x); \
- if (!screen->vk_##x) { \
- debug_printf("GetInstanceProcAddr failed: vk"#x"\n"); \
- return false; \
- } \
- } while (0)
-
-#define GET_PROC_ADDR_INSTANCE_LOCAL(instance, x) PFN_vk##x vk_##x = (PFN_vk##x)vkGetInstanceProcAddr(instance, "vk"#x)
-
static const char *
zink_get_vendor(struct pipe_screen *pscreen)
{
diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index 1ee061ebd9d..07c5ee4d8b5 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -125,4 +125,22 @@ zink_get_format(struct zink_screen *screen, enum pipe_format format);
bool
zink_is_depth_format_supported(struct zink_screen *screen, VkFormat format);
+#define GET_PROC_ADDR(x) do { \
+ screen->vk_##x = (PFN_vk##x)vkGetDeviceProcAddr(screen->dev, "vk"#x); \
+ if (!screen->vk_##x) { \
+ debug_printf("vkGetDeviceProcAddr failed: vk"#x"\n"); \
+ return false; \
+ } \
+ } while (0)
+
+#define GET_PROC_ADDR_INSTANCE(x) do { \
+ screen->vk_##x = (PFN_vk##x)vkGetInstanceProcAddr(screen->instance, "vk"#x); \
+ if (!screen->vk_##x) { \
+ debug_printf("GetInstanceProcAddr failed: vk"#x"\n"); \
+ return false; \
+ } \
+ } while (0)
+
+#define GET_PROC_ADDR_INSTANCE_LOCAL(instance, x) PFN_vk##x vk_##x = (PFN_vk##x)vkGetInstanceProcAddr(instance, "vk"#x)
+
#endif
More information about the mesa-commit
mailing list