From d330e068e92f5994a31d1fecf02820f6513e8d9c Mon Sep 17 00:00:00 2001 From: Johan Gardell Date: Mon, 27 Nov 2017 18:14:56 +0100 Subject: [PATCH 1/2] Visual C++ 2017 compiler issue Extract lambda as local variable fixes strange VS2017 syntax error --- sample/openvr/src/openvr.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sample/openvr/src/openvr.cpp b/sample/openvr/src/openvr.cpp index 5bd19dd..1b631fd 100644 --- a/sample/openvr/src/openvr.cpp +++ b/sample/openvr/src/openvr.cpp @@ -480,13 +480,13 @@ int main(int argc, char **argv) { typedef thread_safe_map_with_callback instance_map_type; - instance_map_type instances([&](const instance_map_type::iterator &begin, - const instance_map_type::iterator &end) { + auto callback = [&](const instance_map_type::iterator &begin, + const instance_map_type::iterator &end) { std::vector> command_buffers; command_buffers.reserve(std::distance(begin, end)); std::transform(begin, end, std::back_inserter(command_buffers), - [](instance_map_type::value_type &value) { + [](instance_map_type::value_type &value) { return std::ref(value.second.command_buffer); }); shared_command_buffer = @@ -496,7 +496,8 @@ int main(int argc, char **argv) { update_matrix_callback = recalculate_update_matrix_callback( mat4Projection, begin, end); - }); + }; + instance_map_type instances(callback); const VkViewport viewports[] = { vr_instance.get_viewport(0, 0, 1), vr_instance.get_viewport(1, 0, 1) }; @@ -544,4 +545,4 @@ int main(int argc, char **argv) { break; } }); -} +} \ No newline at end of file From 97e56682effe37f6f4ae432442e01b57d325562e Mon Sep 17 00:00:00 2001 From: Johan Gardell Date: Mon, 27 Nov 2017 18:15:39 +0100 Subject: [PATCH 2/2] Update path to VulkanSDK .lib files for VulkanSDK 1.0.65.0 --- sample/cube/CMakeLists.txt | 2 +- sample/heightmap/CMakeLists.txt | 2 +- sample/lighting/CMakeLists.txt | 2 +- sample/normal-mapping-and-cube-texture/CMakeLists.txt | 2 +- sample/openvr/CMakeLists.txt | 2 +- sample/teapot/CMakeLists.txt | 2 +- vcc-test/CMakeLists.txt | 2 +- vcc/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sample/cube/CMakeLists.txt b/sample/cube/CMakeLists.txt index 7f80d12..1a41b16 100644 --- a/sample/cube/CMakeLists.txt +++ b/sample/cube/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories(../../vcc-image/include) include_directories(${GLM_SRC_DIR}) if(NOT VULKAN_SDK_DIR STREQUAL "") include_directories(${VULKAN_SDK_DIR}/include) - link_directories(${VULKAN_SDK_DIR}/bin) + link_directories(${VULKAN_SDK_DIR}/lib) endif() set(SAMPLE_CUBE_SRCS diff --git a/sample/heightmap/CMakeLists.txt b/sample/heightmap/CMakeLists.txt index ea585d3..7b40c5c 100644 --- a/sample/heightmap/CMakeLists.txt +++ b/sample/heightmap/CMakeLists.txt @@ -19,7 +19,7 @@ include_directories(${CPP_FRP_SRC_DIR}/cpp-frp/include) include_directories(${GLM_SRC_DIR}) if(NOT VULKAN_SDK_DIR STREQUAL "") include_directories(${VULKAN_SDK_DIR}/include) - link_directories(${VULKAN_SDK_DIR}/bin) + link_directories(${VULKAN_SDK_DIR}/lib) endif() set(SAMPLE_HEIGHTMAP_SRCS diff --git a/sample/lighting/CMakeLists.txt b/sample/lighting/CMakeLists.txt index 797cb9b..4075e97 100644 --- a/sample/lighting/CMakeLists.txt +++ b/sample/lighting/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories(${CMAKE_BINARY_DIR}/vcc/include) include_directories(${GLM_SRC_DIR}) if(NOT VULKAN_SDK_DIR STREQUAL "") include_directories(${VULKAN_SDK_DIR}/include) - link_directories(${VULKAN_SDK_DIR}/bin) + link_directories(${VULKAN_SDK_DIR}/lib) endif() set(SAMPLE_LIGHTING_INCLUDES diff --git a/sample/normal-mapping-and-cube-texture/CMakeLists.txt b/sample/normal-mapping-and-cube-texture/CMakeLists.txt index 591e89f..dcf2283 100644 --- a/sample/normal-mapping-and-cube-texture/CMakeLists.txt +++ b/sample/normal-mapping-and-cube-texture/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories(../../vcc-image/include) include_directories(${GLM_SRC_DIR}) if(NOT VULKAN_SDK_DIR STREQUAL "") include_directories(${VULKAN_SDK_DIR}/include) - link_directories(${VULKAN_SDK_DIR}/bin) + link_directories(${VULKAN_SDK_DIR}/lib) endif() set(SAMPLE_NORMAL_MAPPING_AND_CUBE_TEXTURE_SRCS diff --git a/sample/openvr/CMakeLists.txt b/sample/openvr/CMakeLists.txt index eab94cd..8494869 100644 --- a/sample/openvr/CMakeLists.txt +++ b/sample/openvr/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories(${GLM_SRC_DIR}) include_directories(${OPENVR_SOURCE_DIR}/headers) if(NOT VULKAN_SDK_DIR STREQUAL "") include_directories(${VULKAN_SDK_DIR}/include) - link_directories(${VULKAN_SDK_DIR}/bin) + link_directories(${VULKAN_SDK_DIR}/lib) endif() set(SAMPLE_OPENVR_INCLUDES diff --git a/sample/teapot/CMakeLists.txt b/sample/teapot/CMakeLists.txt index d6a11ed..33a439e 100644 --- a/sample/teapot/CMakeLists.txt +++ b/sample/teapot/CMakeLists.txt @@ -19,7 +19,7 @@ include_directories(../../vcc-image/include) include_directories(${GLM_SRC_DIR}) if(NOT VULKAN_SDK_DIR STREQUAL "") include_directories(${VULKAN_SDK_DIR}/include) - link_directories(${VULKAN_SDK_DIR}/bin) + link_directories(${VULKAN_SDK_DIR}/lib) endif() set(SAMPLE_TEAPOT_INCLUDES diff --git a/vcc-test/CMakeLists.txt b/vcc-test/CMakeLists.txt index 8b7f776..d71aa96 100644 --- a/vcc-test/CMakeLists.txt +++ b/vcc-test/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories(${gtest_SOURCE_DIR}/include) include_directories(${GLM_SRC_DIR}) if(NOT VULKAN_SDK_DIR STREQUAL "") include_directories(${VULKAN_SDK_DIR}/include) - link_directories(${VULKAN_SDK_DIR}/bin) + link_directories(${VULKAN_SDK_DIR}/lib) endif() set(VCC_TEST_SRCS diff --git a/vcc/CMakeLists.txt b/vcc/CMakeLists.txt index fbf9896..99b34a4 100644 --- a/vcc/CMakeLists.txt +++ b/vcc/CMakeLists.txt @@ -17,7 +17,7 @@ include_directories(../types/include) include_directories(${GLM_SRC_DIR}) if(NOT VULKAN_SDK_DIR STREQUAL "") include_directories(${VULKAN_SDK_DIR}/include) - link_directories(${VULKAN_SDK_DIR}/bin) + link_directories(${VULKAN_SDK_DIR}/lib) endif() if(DEFINED ANDROID_NDK) include_directories(${ANDROID_NDK}/sources/android/native_app_glue/)