Skip to content

Brought libraries up to date #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chaoticbob wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Brought libraries up to date #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion projects/common/bitmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions projects/common/camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "camera.h"

#include <algorithm>

#include <glm/gtx/transform.hpp>

// =============================================================================
Expand Down
1 change: 1 addition & 0 deletions projects/common/camera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#define GLM_ENABLE_EXPERIMENTAL
#include <glm/glm.hpp>
#include <glm/gtx/quaternion.hpp>

Expand Down
3 changes: 3 additions & 0 deletions projects/common/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ using Microsoft::WRL::ComPtr;
#include <cmath>
#endif

// Put these here for convenience
#define GLM_ENABLE_EXPERIMENTAL

#define GREX_LOG_INFO(MSG) \
{ \
std::stringstream ss_grex_log_info; \
Expand Down
7 changes: 6 additions & 1 deletion projects/common/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,20 +564,24 @@ 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;
initInfo.MSAASamples = VK_SAMPLE_COUNT_1_BIT;
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();

/*
Copy link
Collaborator

@loosche loosche Oct 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you want to leave all this commented out code here?

// Upload Fonts
{
VkCommandPool commandPool = VK_NULL_HANDLE;
Expand Down Expand Up @@ -656,6 +660,7 @@ bool GrexWindow::InitImGuiForVulkan(VulkanRenderer* pRenderer, VkRenderPass rend
vkFreeCommandBuffers(pRenderer->Device, commandPool, 1, &commandBuf);
vkDestroyCommandPool(pRenderer->Device, commandPool, nullptr);
}
*/

mImGuiEnabled = true;

Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/101_color_cube_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/102_cornell_box_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/103_cone_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/104_debug_tbn_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/110_mesh_shader_triangle_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/111_mesh_shader_meshlets_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/112_mesh_shader_amplification_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/113_mesh_shader_instancing_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/114_mesh_shader_culling_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/115_mesh_shader_lod_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/116_mesh_shader_calc_lod_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/117_mesh_shader_cull_lod_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/118_mesh_shader_vertex_attrs_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/geometry/119_mesh_shader_vertex_bary_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/io/401_gltf_basic_geo_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/io/402_gltf_basic_texture_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/io/403_gltf_basic_material_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/pbr/201_pbr_spheres_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/pbr/202_pbr_camera_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/pbr/203_pbr_align_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/pbr/251_pbr_explorer_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/pbr/252_pbr_material_properties_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
4 changes: 2 additions & 2 deletions projects/pbr/253_pbr_material_textures_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions projects/raytracing/000_raygen_uv_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/raytracing/001_raytracing_basic_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/raytracing/002_basic_procedural_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/raytracing/003_sphereflake_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/raytracing/004_basic_reflection_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions projects/raytracing/005_basic_shadow_vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading