diff --git a/CMakeLists.txt b/CMakeLists.txt index 90bd7ac4..76ec922c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,6 +137,7 @@ set(ENABLE_GLSLANG_JS OFF CACHE BOOL "" FORCE) set(ENABLE_HLSL OFF CACHE BOOL "" FORCE) set(ENABLE_PCH OFF CACHE BOOL "" FORCE) set(ENABLE_CTEST OFF CACHE BOOL "" FORCE) +set(ENABLE_OPT OFF CACHE BOOL "" FORCE) add_subdirectory(${GREX_THIRD_PARTY_DIR}/glslang) message("Enabled GLSL runtime shader compilation with glslang") diff --git a/projects/common/bitmap.cpp b/projects/common/bitmap.cpp index 9d1ada58..182a6e73 100644 --- a/projects/common/bitmap.cpp +++ b/projects/common/bitmap.cpp @@ -12,7 +12,7 @@ #include "stb_image_write.h" #define STB_IMAGE_RESIZE_IMPLEMENTATION -#include "stb_image_resize.h" +#include "stb_image_resize2.h" #if defined(GREX_ENABLE_EXR) # define TINYEXR_IMPLEMENTATION diff --git a/projects/common/camera.cpp b/projects/common/camera.cpp index c1960a09..d58af1b9 100644 --- a/projects/common/camera.cpp +++ b/projects/common/camera.cpp @@ -1,6 +1,7 @@ #include "camera.h" #include + #include // ============================================================================= diff --git a/projects/common/camera.h b/projects/common/camera.h index 3aef96a2..730c9f87 100644 --- a/projects/common/camera.h +++ b/projects/common/camera.h @@ -1,5 +1,6 @@ #pragma once +#define GLM_ENABLE_EXPERIMENTAL #include #include diff --git a/projects/common/config.h b/projects/common/config.h index e450b3eb..ba29f62f 100644 --- a/projects/common/config.h +++ b/projects/common/config.h @@ -22,6 +22,9 @@ using Microsoft::WRL::ComPtr; #include #endif +// Put these here for convenience +#define GLM_ENABLE_EXPERIMENTAL + #define GREX_LOG_INFO(MSG) \ { \ std::stringstream ss_grex_log_info; \ diff --git a/projects/common/window.cpp b/projects/common/window.cpp index 565e877d..f9012e7f 100644 --- a/projects/common/window.cpp +++ b/projects/common/window.cpp @@ -564,6 +564,7 @@ bool GrexWindow::InitImGuiForVulkan(VulkanRenderer* pRenderer, VkRenderPass rend initInfo.Queue = pRenderer->Queue; initInfo.PipelineCache = VK_NULL_HANDLE; initInfo.DescriptorPool = mDescriptorPool; + initInfo.RenderPass = renderPass; initInfo.Subpass = 0; initInfo.MinImageCount = pRenderer->SwapchainImageCount; initInfo.ImageCount = pRenderer->SwapchainImageCount; @@ -571,13 +572,16 @@ bool GrexWindow::InitImGuiForVulkan(VulkanRenderer* pRenderer, VkRenderPass rend initInfo.Allocator = nullptr; initInfo.CheckVkResultFn = CheckVkResult; - res = ImGui_ImplVulkan_Init(&initInfo, renderPass); + res = ImGui_ImplVulkan_Init(&initInfo); if (res == false) { assert(false && "ImGui init Vulkan failed!"); return false; } + ImGui_ImplVulkan_CreateFontsTexture(); + + /* // Upload Fonts { VkCommandPool commandPool = VK_NULL_HANDLE; @@ -656,6 +660,7 @@ bool GrexWindow::InitImGuiForVulkan(VulkanRenderer* pRenderer, VkRenderPass rend vkFreeCommandBuffers(pRenderer->Device, commandPool, 1, &commandBuf); vkDestroyCommandPool(pRenderer->Device, commandPool, nullptr); } + */ mImGuiEnabled = true; diff --git a/projects/geometry/101_color_cube_vulkan/CMakeLists.txt b/projects/geometry/101_color_cube_vulkan/CMakeLists.txt index 47c073ac..2d7404df 100644 --- a/projects/geometry/101_color_cube_vulkan/CMakeLists.txt +++ b/projects/geometry/101_color_cube_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "geometry") diff --git a/projects/geometry/102_cornell_box_vulkan/CMakeLists.txt b/projects/geometry/102_cornell_box_vulkan/CMakeLists.txt index d22a4f43..22b19595 100644 --- a/projects/geometry/102_cornell_box_vulkan/CMakeLists.txt +++ b/projects/geometry/102_cornell_box_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "geometry") diff --git a/projects/geometry/103_cone_vulkan/CMakeLists.txt b/projects/geometry/103_cone_vulkan/CMakeLists.txt index ca639688..73567117 100644 --- a/projects/geometry/103_cone_vulkan/CMakeLists.txt +++ b/projects/geometry/103_cone_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "geometry") diff --git a/projects/geometry/104_debug_tbn_vulkan/CMakeLists.txt b/projects/geometry/104_debug_tbn_vulkan/CMakeLists.txt index 7886481b..815682b2 100644 --- a/projects/geometry/104_debug_tbn_vulkan/CMakeLists.txt +++ b/projects/geometry/104_debug_tbn_vulkan/CMakeLists.txt @@ -15,8 +15,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp ${IMGUI_VULKAN_FILES} - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.h ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.c ) diff --git a/projects/geometry/110_mesh_shader_triangle_vulkan/CMakeLists.txt b/projects/geometry/110_mesh_shader_triangle_vulkan/CMakeLists.txt index da1bf7af..e2fecd93 100644 --- a/projects/geometry/110_mesh_shader_triangle_vulkan/CMakeLists.txt +++ b/projects/geometry/110_mesh_shader_triangle_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "geometry") diff --git a/projects/geometry/111_mesh_shader_meshlets_vulkan/CMakeLists.txt b/projects/geometry/111_mesh_shader_meshlets_vulkan/CMakeLists.txt index 8b362331..42592f58 100644 --- a/projects/geometry/111_mesh_shader_meshlets_vulkan/CMakeLists.txt +++ b/projects/geometry/111_mesh_shader_meshlets_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "geometry") diff --git a/projects/geometry/112_mesh_shader_amplification_vulkan/CMakeLists.txt b/projects/geometry/112_mesh_shader_amplification_vulkan/CMakeLists.txt index 095be8f4..0b968438 100644 --- a/projects/geometry/112_mesh_shader_amplification_vulkan/CMakeLists.txt +++ b/projects/geometry/112_mesh_shader_amplification_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "geometry") diff --git a/projects/geometry/113_mesh_shader_instancing_vulkan/CMakeLists.txt b/projects/geometry/113_mesh_shader_instancing_vulkan/CMakeLists.txt index c43fa5bc..310db82a 100644 --- a/projects/geometry/113_mesh_shader_instancing_vulkan/CMakeLists.txt +++ b/projects/geometry/113_mesh_shader_instancing_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/geometry/114_mesh_shader_culling_vulkan/CMakeLists.txt b/projects/geometry/114_mesh_shader_culling_vulkan/CMakeLists.txt index 9685e062..22e1bbe7 100644 --- a/projects/geometry/114_mesh_shader_culling_vulkan/CMakeLists.txt +++ b/projects/geometry/114_mesh_shader_culling_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/geometry/115_mesh_shader_lod_vulkan/CMakeLists.txt b/projects/geometry/115_mesh_shader_lod_vulkan/CMakeLists.txt index f03384c5..8308d063 100644 --- a/projects/geometry/115_mesh_shader_lod_vulkan/CMakeLists.txt +++ b/projects/geometry/115_mesh_shader_lod_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/geometry/116_mesh_shader_calc_lod_vulkan/CMakeLists.txt b/projects/geometry/116_mesh_shader_calc_lod_vulkan/CMakeLists.txt index dafa6821..5958942d 100644 --- a/projects/geometry/116_mesh_shader_calc_lod_vulkan/CMakeLists.txt +++ b/projects/geometry/116_mesh_shader_calc_lod_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/geometry/117_mesh_shader_cull_lod_vulkan/CMakeLists.txt b/projects/geometry/117_mesh_shader_cull_lod_vulkan/CMakeLists.txt index 2f10db1b..116cfe90 100644 --- a/projects/geometry/117_mesh_shader_cull_lod_vulkan/CMakeLists.txt +++ b/projects/geometry/117_mesh_shader_cull_lod_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/geometry/118_mesh_shader_vertex_attrs_vulkan/CMakeLists.txt b/projects/geometry/118_mesh_shader_vertex_attrs_vulkan/CMakeLists.txt index 5cfea4a4..850db11b 100644 --- a/projects/geometry/118_mesh_shader_vertex_attrs_vulkan/CMakeLists.txt +++ b/projects/geometry/118_mesh_shader_vertex_attrs_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/geometry/119_mesh_shader_vertex_bary_vulkan/CMakeLists.txt b/projects/geometry/119_mesh_shader_vertex_bary_vulkan/CMakeLists.txt index 7841b5ec..2747fe0e 100644 --- a/projects/geometry/119_mesh_shader_vertex_bary_vulkan/CMakeLists.txt +++ b/projects/geometry/119_mesh_shader_vertex_bary_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/camera.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/io/401_gltf_basic_geo_vulkan/CMakeLists.txt b/projects/io/401_gltf_basic_geo_vulkan/CMakeLists.txt index 243fdc44..3f5a3282 100644 --- a/projects/io/401_gltf_basic_geo_vulkan/CMakeLists.txt +++ b/projects/io/401_gltf_basic_geo_vulkan/CMakeLists.txt @@ -20,8 +20,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_faux_render.cpp ${GREX_PROJECTS_COMMON_DIR}/bitmap.h ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "io") diff --git a/projects/io/402_gltf_basic_texture_vulkan/CMakeLists.txt b/projects/io/402_gltf_basic_texture_vulkan/CMakeLists.txt index 1477d6b7..ad22a78a 100644 --- a/projects/io/402_gltf_basic_texture_vulkan/CMakeLists.txt +++ b/projects/io/402_gltf_basic_texture_vulkan/CMakeLists.txt @@ -20,8 +20,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_faux_render.cpp ${GREX_PROJECTS_COMMON_DIR}/bitmap.h ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "io") diff --git a/projects/io/403_gltf_basic_material_vulkan/CMakeLists.txt b/projects/io/403_gltf_basic_material_vulkan/CMakeLists.txt index 8c1b6116..8186c694 100644 --- a/projects/io/403_gltf_basic_material_vulkan/CMakeLists.txt +++ b/projects/io/403_gltf_basic_material_vulkan/CMakeLists.txt @@ -20,8 +20,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_faux_render.cpp ${GREX_PROJECTS_COMMON_DIR}/bitmap.h ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "io") diff --git a/projects/pbr/201_pbr_spheres_vulkan/CMakeLists.txt b/projects/pbr/201_pbr_spheres_vulkan/CMakeLists.txt index 80b589de..84dce6f3 100644 --- a/projects/pbr/201_pbr_spheres_vulkan/CMakeLists.txt +++ b/projects/pbr/201_pbr_spheres_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/pbr/202_pbr_camera_vulkan/CMakeLists.txt b/projects/pbr/202_pbr_camera_vulkan/CMakeLists.txt index 9aa8e277..e920af28 100644 --- a/projects/pbr/202_pbr_camera_vulkan/CMakeLists.txt +++ b/projects/pbr/202_pbr_camera_vulkan/CMakeLists.txt @@ -18,8 +18,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.h ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.c - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/pbr/203_pbr_align_vulkan/CMakeLists.txt b/projects/pbr/203_pbr_align_vulkan/CMakeLists.txt index 8b034094..570b332e 100644 --- a/projects/pbr/203_pbr_align_vulkan/CMakeLists.txt +++ b/projects/pbr/203_pbr_align_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/pbr/251_pbr_explorer_vulkan/CMakeLists.txt b/projects/pbr/251_pbr_explorer_vulkan/CMakeLists.txt index 7acd991c..49834caa 100644 --- a/projects/pbr/251_pbr_explorer_vulkan/CMakeLists.txt +++ b/projects/pbr/251_pbr_explorer_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/pbr/252_pbr_material_properties_vulkan/CMakeLists.txt b/projects/pbr/252_pbr_material_properties_vulkan/CMakeLists.txt index 0e56f7cb..3e6c2ab4 100644 --- a/projects/pbr/252_pbr_material_properties_vulkan/CMakeLists.txt +++ b/projects/pbr/252_pbr_material_properties_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/pbr/253_pbr_material_textures_vulkan/CMakeLists.txt b/projects/pbr/253_pbr_material_textures_vulkan/CMakeLists.txt index 3b4aded3..3173c59e 100644 --- a/projects/pbr/253_pbr_material_textures_vulkan/CMakeLists.txt +++ b/projects/pbr/253_pbr_material_textures_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.h ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.c diff --git a/projects/raytracing/000_raygen_uv_vulkan/CMakeLists.txt b/projects/raytracing/000_raygen_uv_vulkan/CMakeLists.txt index 71253688..3a6870e7 100644 --- a/projects/raytracing/000_raygen_uv_vulkan/CMakeLists.txt +++ b/projects/raytracing/000_raygen_uv_vulkan/CMakeLists.txt @@ -12,8 +12,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_renderer.cpp ${GREX_PROJECTS_COMMON_DIR}/window.h ${GREX_PROJECTS_COMMON_DIR}/window.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/001_raytracing_basic_vulkan/CMakeLists.txt b/projects/raytracing/001_raytracing_basic_vulkan/CMakeLists.txt index 0fa76038..3a6fd2fc 100644 --- a/projects/raytracing/001_raytracing_basic_vulkan/CMakeLists.txt +++ b/projects/raytracing/001_raytracing_basic_vulkan/CMakeLists.txt @@ -12,8 +12,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_renderer.cpp ${GREX_PROJECTS_COMMON_DIR}/window.h ${GREX_PROJECTS_COMMON_DIR}/window.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/002_basic_procedural_vulkan/CMakeLists.txt b/projects/raytracing/002_basic_procedural_vulkan/CMakeLists.txt index 618c3abf..9d2949f5 100644 --- a/projects/raytracing/002_basic_procedural_vulkan/CMakeLists.txt +++ b/projects/raytracing/002_basic_procedural_vulkan/CMakeLists.txt @@ -12,8 +12,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_renderer.cpp ${GREX_PROJECTS_COMMON_DIR}/window.h ${GREX_PROJECTS_COMMON_DIR}/window.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/003_sphereflake_vulkan/CMakeLists.txt b/projects/raytracing/003_sphereflake_vulkan/CMakeLists.txt index afba90e4..e2f6ef45 100644 --- a/projects/raytracing/003_sphereflake_vulkan/CMakeLists.txt +++ b/projects/raytracing/003_sphereflake_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_renderer.cpp ${GREX_PROJECTS_COMMON_DIR}/window.h ${GREX_PROJECTS_COMMON_DIR}/window.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/004_basic_reflection_vulkan/CMakeLists.txt b/projects/raytracing/004_basic_reflection_vulkan/CMakeLists.txt index 7d52fd49..86edecf3 100644 --- a/projects/raytracing/004_basic_reflection_vulkan/CMakeLists.txt +++ b/projects/raytracing/004_basic_reflection_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_renderer.cpp ${GREX_PROJECTS_COMMON_DIR}/window.h ${GREX_PROJECTS_COMMON_DIR}/window.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/005_basic_shadow_vulkan/CMakeLists.txt b/projects/raytracing/005_basic_shadow_vulkan/CMakeLists.txt index 5d9493c9..0d7c11de 100644 --- a/projects/raytracing/005_basic_shadow_vulkan/CMakeLists.txt +++ b/projects/raytracing/005_basic_shadow_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_renderer.cpp ${GREX_PROJECTS_COMMON_DIR}/window.h ${GREX_PROJECTS_COMMON_DIR}/window.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/006_basic_shadow_dynamic_vulkan/CMakeLists.txt b/projects/raytracing/006_basic_shadow_dynamic_vulkan/CMakeLists.txt index ef65a440..e141306d 100644 --- a/projects/raytracing/006_basic_shadow_dynamic_vulkan/CMakeLists.txt +++ b/projects/raytracing/006_basic_shadow_dynamic_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/vk_renderer.cpp ${GREX_PROJECTS_COMMON_DIR}/window.h ${GREX_PROJECTS_COMMON_DIR}/window.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/021_raytracing_triangles_vulkan/CMakeLists.txt b/projects/raytracing/021_raytracing_triangles_vulkan/CMakeLists.txt index eb3abac2..2b0ac28c 100644 --- a/projects/raytracing/021_raytracing_triangles_vulkan/CMakeLists.txt +++ b/projects/raytracing/021_raytracing_triangles_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/022_raytracing_multi_geo_vulkan/CMakeLists.txt b/projects/raytracing/022_raytracing_multi_geo_vulkan/CMakeLists.txt index ce944ba3..b8989089 100644 --- a/projects/raytracing/022_raytracing_multi_geo_vulkan/CMakeLists.txt +++ b/projects/raytracing/022_raytracing_multi_geo_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/023_raytracing_multi_instance_vulkan/CMakeLists.txt b/projects/raytracing/023_raytracing_multi_instance_vulkan/CMakeLists.txt index 0962e95e..69812991 100644 --- a/projects/raytracing/023_raytracing_multi_instance_vulkan/CMakeLists.txt +++ b/projects/raytracing/023_raytracing_multi_instance_vulkan/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/024_raytracing_pbr_spheres_vulkan/CMakeLists.txt b/projects/raytracing/024_raytracing_pbr_spheres_vulkan/CMakeLists.txt index 617f0fd0..35f921ca 100644 --- a/projects/raytracing/024_raytracing_pbr_spheres_vulkan/CMakeLists.txt +++ b/projects/raytracing/024_raytracing_pbr_spheres_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "raytracing") diff --git a/projects/raytracing/025_raytracing_refract_vulkan/CMakeLists.txt b/projects/raytracing/025_raytracing_refract_vulkan/CMakeLists.txt index 91377b23..b6f42050 100644 --- a/projects/raytracing/025_raytracing_refract_vulkan/CMakeLists.txt +++ b/projects/raytracing/025_raytracing_refract_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/raytracing/030_raytracing_path_trace_vulkan/CMakeLists.txt b/projects/raytracing/030_raytracing_path_trace_vulkan/CMakeLists.txt index 5745443e..89836b9f 100644 --- a/projects/raytracing/030_raytracing_path_trace_vulkan/CMakeLists.txt +++ b/projects/raytracing/030_raytracing_path_trace_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/raytracing/030_raytracing_path_trace_vulkan_bof/CMakeLists.txt b/projects/raytracing/030_raytracing_path_trace_vulkan_bof/CMakeLists.txt index 0830bf7f..8ca3fa0f 100644 --- a/projects/raytracing/030_raytracing_path_trace_vulkan_bof/CMakeLists.txt +++ b/projects/raytracing/030_raytracing_path_trace_vulkan_bof/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/raytracing/031_raytracing_path_trace_pbr_vulkan/CMakeLists.txt b/projects/raytracing/031_raytracing_path_trace_pbr_vulkan/CMakeLists.txt index d9c08c7d..d783979b 100644 --- a/projects/raytracing/031_raytracing_path_trace_pbr_vulkan/CMakeLists.txt +++ b/projects/raytracing/031_raytracing_path_trace_pbr_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/window.cpp ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.h ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/texture/301_textured_cube_vulkan/CMakeLists.txt b/projects/texture/301_textured_cube_vulkan/CMakeLists.txt index 658e14ab..d4fb2720 100644 --- a/projects/texture/301_textured_cube_vulkan/CMakeLists.txt +++ b/projects/texture/301_textured_cube_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp ${GREX_PROJECTS_COMMON_DIR}/bitmap.h ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "texture") diff --git a/projects/texture/302_lambert_textured_cube_vulkan/CMakeLists.txt b/projects/texture/302_lambert_textured_cube_vulkan/CMakeLists.txt index 08c0ca89..27f08edb 100644 --- a/projects/texture/302_lambert_textured_cube_vulkan/CMakeLists.txt +++ b/projects/texture/302_lambert_textured_cube_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp ${GREX_PROJECTS_COMMON_DIR}/bitmap.h ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "texture") diff --git a/projects/texture/303_phong_textured_cube_vulkan/CMakeLists.txt b/projects/texture/303_phong_textured_cube_vulkan/CMakeLists.txt index 65d3218c..e7fb30cc 100644 --- a/projects/texture/303_phong_textured_cube_vulkan/CMakeLists.txt +++ b/projects/texture/303_phong_textured_cube_vulkan/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/tri_mesh.cpp ${GREX_PROJECTS_COMMON_DIR}/bitmap.h ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "texture") diff --git a/projects/texture/304_normal_map_vulkan/CMakeLists.txt b/projects/texture/304_normal_map_vulkan/CMakeLists.txt index 29a50749..1c8bba6d 100644 --- a/projects/texture/304_normal_map_vulkan/CMakeLists.txt +++ b/projects/texture/304_normal_map_vulkan/CMakeLists.txt @@ -18,8 +18,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.h ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.c - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "texture") diff --git a/projects/texture/305_normal_map_explorer_vulkan/CMakeLists.txt b/projects/texture/305_normal_map_explorer_vulkan/CMakeLists.txt index c845a216..4f4ce615 100644 --- a/projects/texture/305_normal_map_explorer_vulkan/CMakeLists.txt +++ b/projects/texture/305_normal_map_explorer_vulkan/CMakeLists.txt @@ -18,8 +18,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.h ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.c - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/texture/306_parallax_occlusion_map_vulkan/CMakeLists.txt b/projects/texture/306_parallax_occlusion_map_vulkan/CMakeLists.txt index a40e7fc2..c5831b39 100644 --- a/projects/texture/306_parallax_occlusion_map_vulkan/CMakeLists.txt +++ b/projects/texture/306_parallax_occlusion_map_vulkan/CMakeLists.txt @@ -18,8 +18,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.h ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.c - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "texture") diff --git a/projects/texture/307_parallax_occlusion_map_explorer_vulkan/CMakeLists.txt b/projects/texture/307_parallax_occlusion_map_explorer_vulkan/CMakeLists.txt index ed3cc40a..34bf4ade 100644 --- a/projects/texture/307_parallax_occlusion_map_explorer_vulkan/CMakeLists.txt +++ b/projects/texture/307_parallax_occlusion_map_explorer_vulkan/CMakeLists.txt @@ -18,8 +18,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.h ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.c - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/projects/texture/308_normal_map_vs_pom_vulkan/CMakeLists.txt b/projects/texture/308_normal_map_vs_pom_vulkan/CMakeLists.txt index d5c1de21..1b114884 100644 --- a/projects/texture/308_normal_map_vs_pom_vulkan/CMakeLists.txt +++ b/projects/texture/308_normal_map_vs_pom_vulkan/CMakeLists.txt @@ -18,8 +18,8 @@ add_executable( ${GREX_PROJECTS_COMMON_DIR}/bitmap.cpp ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.h ${GREX_THIRD_PARTY_DIR}/MikkTSpace/mikktspace.c - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/resource_limits_c.cpp - ${GREX_THIRD_PARTY_DIR}/glslang/StandAlone/ResourceLimits.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/resource_limits_c.cpp + ${GREX_THIRD_PARTY_DIR}/glslang/glslang/ResourceLimits/ResourceLimits.cpp ${IMGUI_VULKAN_FILES} ) diff --git a/third_party/DirectX-Headers b/third_party/DirectX-Headers index 48f23952..48a76297 160000 --- a/third_party/DirectX-Headers +++ b/third_party/DirectX-Headers @@ -1 +1 @@ -Subproject commit 48f23952bc08a6dce0727339c07cedbc4797356c +Subproject commit 48a762973271c5a75869946bf1fdbc489a628a5c diff --git a/third_party/VulkanMemoryAllocator b/third_party/VulkanMemoryAllocator index 8b87b6cb..1c35ba99 160000 --- a/third_party/VulkanMemoryAllocator +++ b/third_party/VulkanMemoryAllocator @@ -1 +1 @@ -Subproject commit 8b87b6cbf765d2b4d6cf66a06cc9004e11c096c4 +Subproject commit 1c35ba99ce775f8342d87a83a3f0f696f99c2a39 diff --git a/third_party/cgltf b/third_party/cgltf index 16a16d65..fa3b80fa 160000 --- a/third_party/cgltf +++ b/third_party/cgltf @@ -1 +1 @@ -Subproject commit 16a16d658f1e40983d9eb29cb1fac2fb7c78717c +Subproject commit fa3b80fa762790192c9532b63c441627416ff300 diff --git a/third_party/glfw b/third_party/glfw index 57cbded0..b35641f4 160000 --- a/third_party/glfw +++ b/third_party/glfw @@ -1 +1 @@ -Subproject commit 57cbded0760a50b9039ee0cb3f3c14f60145567c +Subproject commit b35641f4a3c62aa86a0b3c983d163bc0fe36026d diff --git a/third_party/glm b/third_party/glm index fc8f4bb4..33b4a621 160000 --- a/third_party/glm +++ b/third_party/glm @@ -1 +1 @@ -Subproject commit fc8f4bb442b9540969f2f3f351c4960d91bca17a +Subproject commit 33b4a621a697a305bc3a7610d290677b96beb181 diff --git a/third_party/glslang b/third_party/glslang index 1fb2f1d7..2fed4fc0 160000 --- a/third_party/glslang +++ b/third_party/glslang @@ -1 +1 @@ -Subproject commit 1fb2f1d7896627d62a289439a2c3e750e551a7ab +Subproject commit 2fed4fc07c9190df5369db787a679096c55474e5 diff --git a/third_party/imgui b/third_party/imgui index 91667430..99109c0b 160000 --- a/third_party/imgui +++ b/third_party/imgui @@ -1 +1 @@ -Subproject commit 91667430a88f88187c56ea8debb9a5f5f30435d4 +Subproject commit 99109c0b3b052cffa154a9295440f68868a39f74 diff --git a/third_party/meshoptimizer b/third_party/meshoptimizer index e47e1be6..b0cc223e 160000 --- a/third_party/meshoptimizer +++ b/third_party/meshoptimizer @@ -1 +1 @@ -Subproject commit e47e1be6d3d9513153188216455bdbed40a206ef +Subproject commit b0cc223e1a973b848a539c31ae0c4647af598ed7 diff --git a/third_party/stb b/third_party/stb index 5736b15f..2e2bef46 160000 --- a/third_party/stb +++ b/third_party/stb @@ -1 +1 @@ -Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 +Subproject commit 2e2bef463a5b53ddf8bb788e25da6b8506314c08 diff --git a/third_party/tinyexr b/third_party/tinyexr index 02310c77..5fcb4dcb 160000 --- a/third_party/tinyexr +++ b/third_party/tinyexr @@ -1 +1 @@ -Subproject commit 02310c77e5156c36fedf6cf810c4071e3f83906f +Subproject commit 5fcb4dcb6e3abf96214b67e5c54db1ceec6a455c diff --git a/third_party/tinyobjloader b/third_party/tinyobjloader index 0fc802cf..50461d0e 160000 --- a/third_party/tinyobjloader +++ b/third_party/tinyobjloader @@ -1 +1 @@ -Subproject commit 0fc802cf468d23b9d205890b76b268f61b948e6d +Subproject commit 50461d0e0a77c178bb478e9319d7de82f469a848