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

4
samples/11_InitShaders/11_InitShaders.cpp
View File

@@ -62,12 +62,12 @@ int main(int /*argc*/, char ** /*argv*/)
/* VULKAN_HPP_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);

9
samples/11_InitShaders/CMakeLists.txt
View File

@@ -17,15 +17,10 @@ cmake_minimum_required(VERSION 3.2)
project(11_InitShaders)
set(HEADERS
../utils/shaders.hpp
../utils/utils.hpp
)
set(SOURCES
11_InitShaders.cpp
../utils/shaders.cpp
../utils/utils.cpp
../../glslang/StandAlone/ResourceLimits.cpp
)
source_group(headers FILES ${HEADERS})
@@ -37,6 +32,4 @@ add_executable(11_InitShaders
)
set_target_properties(11_InitShaders PROPERTIES FOLDER "Samples")
target_compile_definitions(11_InitShaders PUBLIC VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1)
target_include_directories(11_InitShaders PUBLIC ${CMAKE_SOURCE_DIR}/glslang)
target_link_libraries(11_InitShaders PUBLIC glslang SPIRV)
target_link_libraries(11_InitShaders PRIVATE utils)