summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMark Young <marky@lunarg.com>2017-02-28 09:58:04 -0700
committerMark Young <marky@lunarg.com>2017-03-01 08:20:22 -0700
commit7b06221f2c4cb2205e0363afe1ce59b81aa144a1 (patch)
tree1055a135108d1608a1e22186d911ccfc2087060e /CMakeLists.txt
parenta00917b8295326a0c0501aefe5ab4c12a501a4c5 (diff)
vulkan: update to header 1.0.42
Updated all necessary files to 1.0.42. This includes the various headers as well as the loader, and the parameter validation, object tracking, and threading layers. Additionally, bump all layer JSON files to 1.0.42. Also, in this change: - Enable loader extension automation so that the loader now generates all extension entry-points automatically during build to reduce likelihood of missing a critical piece on header update. - Enable layer dispatch table extension automation for the same reason. - Fixes from Mark Lobodzinski and Tony Barbour to resolve crash in loader when working with Intel's Windows driver due to GetInstanceProcAddr getting called on inappropriate command names. Change-Id: Ic18d3fac2e145c386c0192031deb5089c91a00d8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c512267..826e56b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
if (BUILD_WSI_WAYLAND_SUPPORT)
find_package(Wayland REQUIRED)
- include_directories(${WAYLAND_CLIENT_INCLUDE_DIR})
endif()
if (BUILD_WSI_MIR_SUPPORT)
@@ -272,21 +271,27 @@ endmacro()
# Custom target for generated vulkan helper file dependencies
add_custom_target(generate_helper_files DEPENDS
- vk_dispatch_table_helper.h
vk_enum_string_helper.h
vk_struct_size_helper.h
vk_struct_size_helper.c
vk_safe_struct.h
vk_safe_struct.cpp
+ vk_layer_dispatch_table.h
+ vk_dispatch_table_helper.h
+ vk_loader_extensions.h
+ vk_loader_extensions.c
)
# Rules to build generated helper files
+run_vk_xml_generate(loader_extension_generator.py vk_loader_extensions.c)
+run_vk_xml_generate(loader_extension_generator.py vk_loader_extensions.h)
+run_vk_xml_generate(loader_extension_generator.py vk_layer_dispatch_table.h)
+run_vk_xml_generate(dispatch_table_helper_generator.py vk_dispatch_table_helper.h)
run_vk_xml_generate(helper_file_generator.py vk_safe_struct.h)
run_vk_xml_generate(helper_file_generator.py vk_safe_struct.cpp)
run_vk_xml_generate(helper_file_generator.py vk_struct_size_helper.h)
run_vk_xml_generate(helper_file_generator.py vk_struct_size_helper.c)
run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h)
-run_vk_xml_generate(dispatch_table_generator.py vk_dispatch_table_helper.h)
if(NOT WIN32)
include(GNUInstallDirs)