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

14
samples/RayTracing/CMakeLists.txt
View File

@@ -18,16 +18,11 @@ project(RayTracing)
set(HEADERS
CameraManipulator.hpp
../utils/shaders.hpp
../utils/utils.hpp
)
set(SOURCES
CameraManipulator.cpp
RayTracing.cpp
../utils/shaders.cpp
../utils/utils.cpp
../../glslang/StandAlone/ResourceLimits.cpp
)
source_group(headers FILES ${HEADERS})
@@ -39,17 +34,10 @@ add_executable(RayTracing
)
set_target_properties(RayTracing PROPERTIES FOLDER "Samples")
target_compile_definitions(RayTracing PUBLIC VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1)
target_link_libraries(RayTracing PRIVATE utils)
target_include_directories(RayTracing PUBLIC
${CMAKE_SOURCE_DIR}/glslang
${CMAKE_SOURCE_DIR}/glfw/include
${CMAKE_SOURCE_DIR}/samples/RayTracing/common
${CMAKE_SOURCE_DIR}/samples/RayTracing/vulkannv
${CMAKE_SOURCE_DIR}/stb
${CMAKE_SOURCE_DIR}/tinyobjloader
)
target_link_libraries(RayTracing PUBLIC glslang SPIRV
legacy_stdio_definitions.lib
${CMAKE_SOURCE_DIR}/builds/VS2017_64/glfw/src/Debug/glfw3.lib
)

2
samples/RayTracing/CameraManipulator.hpp
View File

@@ -29,7 +29,7 @@ namespace vk
enum class Mode { Examine, Fly, Walk, Trackball };
enum class MouseButton { None, Left, Middle, Right };
enum class ModifierFlagBits { Shift = 1, Ctrl = 2, Alt = 4 };
using ModifierFlags = vk::Flags<ModifierFlagBits>;
using ModifierFlags = vk::Flags<ModifierFlagBits, uint32_t>;
public:
CameraManipulator();

10
samples/RayTracing/RayTracing.cpp
View File

@@ -31,8 +31,8 @@
#include <glm/gtc/matrix_transform.hpp>
#include "CameraManipulator.hpp"
#include "..\..\utils\shaders.hpp"
#include "..\..\utils\utils.hpp"
#include "../utils/shaders.hpp"
#include "../utils/utils.hpp"
#include "SPIRV/GlslangToSpv.h"
static char const* AppName = "RayTracing";
@@ -939,7 +939,7 @@ int main(int /*argc*/, char** /*argv*/)
std::array<vk::ClearValue, 2> clearValues;
clearValues[0].color = vk::ClearColorValue(std::array<float, 4>({0.2f, 0.2f, 0.2f, 0.2f}));
clearValues[1].depthStencil = {1.0f, 0};
clearValues[1].depthStencil = vk::ClearDepthStencilValue(1.0f, 0);
// Main loop
uint32_t frameIndex = 0;
@@ -1067,12 +1067,12 @@ int main(int /*argc*/, char** /*argv*/)
glfwDestroyWindow(window);
glfwTerminate();
}
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);