Skip to content
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

Preliminary Vulkan AS/RQ test #3483

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Preliminary Vulkan AS/RQ test #3483

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 util/test/demos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ set(VULKAN_SRC
vk/vk_pixel_history.cpp
vk/vk_postponed.cpp
vk/vk_query_pool.cpp
vk/vk_ray_query.cpp
vk/vk_read_before_overwrite.cpp
vk/vk_resource_lifetimes.cpp
vk/vk_robustness2.cpp
Expand Down
1 change: 1 addition & 0 deletions util/test/demos/demos.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@
<ClCompile Include="vk\vk_multi_thread_windows.cpp" />
<ClCompile Include="vk\vk_postponed.cpp" />
<ClCompile Include="vk\vk_query_pool.cpp" />
<ClCompile Include="vk\vk_ray_query.cpp" />
<ClCompile Include="vk\vk_read_before_overwrite.cpp" />
<ClCompile Include="vk\vk_robustness2.cpp" />
<ClCompile Include="vk\vk_separate_depth_stencil_layouts.cpp" />
Expand Down
3 changes: 3 additions & 0 deletions util/test/demos/demos.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,9 @@
<ClCompile Include="d3d12\d3d12_rtas_zoo.cpp">
<Filter>D3D12\demos</Filter>
</ClCompile>
<ClCompile Include="vk\vk_ray_query.cpp">
<Filter>Vulkan\demos</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="D3D11">
Expand Down
6 changes: 5 additions & 1 deletion util/test/demos/vk/vk_headers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,12 @@
// then include volk
#include "3rdparty/volk/volk.h"

#if defined(__linux__) && defined(__GLIBCXX__) && defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)
#define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) aligned_alloc(alignment, size)
#endif

// avoid warning about unused variables
#define VMA_DEBUG_LOG_FORMAT(format, ...) (void)(__VA_ARGS__);
#define VMA_DEBUG_LOG_FORMAT(format, ...) (void)(#__VA_ARGS__)

// finally VMA
#include "3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h"
Loading