Mesa (main): vulkan/vk_extensions_gen: Stop including vk_object.h

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Oct 29 23:37:09 UTC 2021


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

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri Oct  1 17:07:56 2021 -0500

vulkan/vk_extensions_gen: Stop including vk_object.h

All we need from it is vulkan_common.h for VkExtensionProperties.

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13156>

---

 src/vulkan/util/vk_extensions_gen.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/vulkan/util/vk_extensions_gen.py b/src/vulkan/util/vk_extensions_gen.py
index 6af21bbd232..f945911750d 100644
--- a/src/vulkan/util/vk_extensions_gen.py
+++ b/src/vulkan/util/vk_extensions_gen.py
@@ -93,9 +93,8 @@ ${driver}_physical_device_get_supported_extensions(const struct ${driver}_physic
 """)
 
 _TEMPLATE_C = Template(COPYRIGHT + """
-%if driver == 'vk':
-#include "vk_object.h"
-%else:
+#include "vulkan/vulkan_core.h"
+%if driver != 'vk':
 #include "${driver}_private.h"
 %endif
 



More information about the mesa-commit mailing list