aboutsummaryrefslogtreecommitdiff
path: root/vulkaninfo
diff options
context:
space:
mode:
authorCharles Giessen <charles@lunarg.com>2020-04-25 18:53:21 -0600
committerCharles Giessen <46324611+charles-lunarg@users.noreply.github.com>2020-05-26 10:39:18 -0600
commit5aaa64364e7a255948a44ef151208fe85dcd5834 (patch)
treecad5f8be54d1e988a33a6fc83d0b1ed967f1d993 /vulkaninfo
parent0c4ea014bf289e8b0a8501c3e89c8bc4ecf9f0a4 (diff)
downloadusermoji-5aaa64364e7a255948a44ef151208fe85dcd5834.tar.xz
vulkaninfo: use generate_source.py for autogen
Previously, to update the autogen for vulkaninfo required running a separate cmake target. This commit puts it all into the same target for ease of maintenance. Change-Id: I98e35b01ee164e9917564f6b603e4a78c6138041
Diffstat (limited to 'vulkaninfo')
-rw-r--r--vulkaninfo/CMakeLists.txt16
-rw-r--r--vulkaninfo/generated/vulkaninfo.hpp1
2 files changed, 1 insertions, 16 deletions
diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt
index ac3070ca..05b3f9ed 100644
--- a/vulkaninfo/CMakeLists.txt
+++ b/vulkaninfo/CMakeLists.txt
@@ -17,22 +17,6 @@
# CMakeLists.txt file for building Vulkaninfo
-find_package(PythonInterp 3 QUIET)
-set (PYTHON_CMD ${PYTHON_EXECUTABLE})
-
-set(VKINFO_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(KVULKANTOOLS_SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/scripts)
-
-if(PYTHONINTERP_FOUND)
- add_custom_target(generate_vulkaninfo_hpp
- COMMAND ${PYTHON_CMD} ${KVULKANTOOLS_SCRIPTS_DIR}/kvt_genvk.py -registry ${VulkanRegistry_DIR}/vk.xml -scripts ${VulkanRegistry_DIR} vulkaninfo.hpp
- DEPENDS ${VulkanRegistry_DIR}/vk.xml ${VulkanRegistry_DIR}/generator.py ${KVULKANTOOLS_SCRIPTS_DIR}/vulkaninfo_generator.py ${KVULKANTOOLS_SCRIPTS_DIR}/kvt_genvk.py ${VulkanRegistry_DIR}/reg.py
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vulkaninfo/generated
- )
- else()
- message("WARNING: generate_vulkaninfo_hpp target requires python 3")
-endif()
-
if(WIN32)
add_executable(vulkaninfo vulkaninfo.cpp vulkaninfo.rc)
elseif(APPLE)
diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp
index 03c32e04..cfca7322 100644
--- a/vulkaninfo/generated/vulkaninfo.hpp
+++ b/vulkaninfo/generated/vulkaninfo.hpp
@@ -48,6 +48,7 @@ std::string to_hex_str(Printer &p, T i) {
else
return to_hex_str(i);
}
+
static const char *VkResultString(VkResult value) {
switch (value) {
case (0): return "SUCCESS";