mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Building samples for Linux (#491)

Browse Source 
* CMake: Fix SAMPLES_BUILD and TESTS_BUILD

* CMake: Enable sample build on linux

* samples: Use glfw for window creation

* samples: Fix include order

* samples: Support new window handling

* samples: Add build target for util

* samples: Update CMake scripts to use util target

* samples: Add WindowData to manage unique window

* samples: Surface handling using WIndowData

* sampels: Remove call for vk::su::destroyWindow()

* CMake: FIx more options

* samples: Build SurfaceCapabilities only on WIN32

* samples: Fixed RayTracing sample to build on Linux

* samples: Fix wrong check on SurfaceProtectedCapabilitiesKHR

This also fixes compilation with MinGW gcc/clang

* CMake: check CMAKE_SYSTEM_NAME for Linux samples

* CMake: Add source group for utils

* samples: Fix potential bugs

* samples: Reduce warnings on gcc/clang

* samples: Fix missmatched new/free() which is UB

* samples: Add missing initialization for dynamic dispatcher

* samples: Remove unnecessary  dispacther construct

Co-authored-by: Andreas Süßenbach <asuessenbach@nvidia.com>
This commit is contained in:
mocabe
2020-01-28 18:16:10 +09:00
committed by Andreas Süßenbach
parent f1668a6e28
commit b6a190f4a2
100 changed files with 408 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/EnableValidationWithCallback/CMakeLists.txt
View File

@@ -32,4 +32,4 @@ add_executable(EnableValidationWithCallback
)
set_target_properties(EnableValidationWithCallback PROPERTIES FOLDER "Samples")
target_link_libraries(EnableValidationWithCallback PUBLIC "${Vulkan_LIBRARIES}")
target_link_libraries(EnableValidationWithCallback PRIVATE utils)

16
samples/EnableValidationWithCallback/EnableValidationWithCallback.cpp
View File

@@ -101,6 +101,13 @@ int main(int /*argc*/, char ** /*argv*/)
{
try
{
#if (VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1)
// initialize the DipatchLoaderDynamic to use
static vk::DynamicLoader dl;
PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = dl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");
VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);
#endif
std::vector<vk::LayerProperties> instanceLayerProperties = vk::enumerateInstanceLayerProperties();
/* VULKAN_KEY_START */
@@ -123,6 +130,11 @@ int main(int /*argc*/, char ** /*argv*/)
vk::su::checked_cast<uint32_t>(instanceExtensionNames.size()) , instanceExtensionNames.data() );
vk::UniqueInstance instance = vk::createInstanceUnique(instanceCreateInfo);
#if (VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1)
// initialize function pointers for instance
VULKAN_HPP_DEFAULT_DISPATCHER.init(*instance);
#endif
pfnVkCreateDebugUtilsMessengerEXT = reinterpret_cast<PFN_vkCreateDebugUtilsMessengerEXT>(instance->getProcAddr("vkCreateDebugUtilsMessengerEXT"));
if (!pfnVkCreateDebugUtilsMessengerEXT)
{
@@ -164,12 +176,12 @@ int main(int /*argc*/, char ** /*argv*/)
/* VULKAN_KEY_END */
}
catch (vk::SystemError err)
catch (vk::SystemError& err)
{
std::cout << "vk::SystemError: " << err.what() << std::endl;
exit(-1);
}
catch (std::runtime_error err)
catch (std::runtime_error& err)
{
std::cout << "std::runtime_error: " << err.what() << std::endl;
exit(-1);