Skip to content

Commit d4935a1

Browse files
author
devsh
committed
Merge remote-tracking branch 'remotes/origin/master' into material_compiler_v3
2 parents 25b02d2 + eeea1eb commit d4935a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+7722
-3229
lines changed

05_StreamingAndBufferDeviceAddressApp/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ class StreamingAndBufferDeviceAddressApp final : public application_templates::M
113113
// `CAsyncSingleBufferSubAllocator` just allows you suballocate subranges of any `IGPUBuffer` range with deferred/latched frees.
114114
constexpr uint32_t DownstreamBufferSize = sizeof(output_t)<<23;
115115
constexpr uint32_t UpstreamBufferSize = sizeof(input_t)<<23;
116-
117-
m_utils = make_smart_refctd_ptr<IUtilities>(smart_refctd_ptr(m_device),smart_refctd_ptr(m_logger),DownstreamBufferSize,UpstreamBufferSize);
116+
117+
m_utils = IUtilities::create(smart_refctd_ptr(m_device),smart_refctd_ptr(m_logger),DownstreamBufferSize,UpstreamBufferSize);
118118
if (!m_utils)
119119
return logFail("Failed to create Utilities!");
120120
m_upStreamingBuffer = m_utils->getDefaultUpStreamingBuffer();

11_FFT/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class FFT_Test final : public application_templates::MonoDeviceApplication, publ
9595
constexpr uint32_t DownstreamBufferSize = sizeof(scalar_t) << 23;
9696
constexpr uint32_t UpstreamBufferSize = sizeof(scalar_t) << 23;
9797

98-
m_utils = make_smart_refctd_ptr<IUtilities>(smart_refctd_ptr(m_device), smart_refctd_ptr(m_logger), DownstreamBufferSize, UpstreamBufferSize);
98+
m_utils = IUtilities::create(smart_refctd_ptr(m_device), smart_refctd_ptr(m_logger), DownstreamBufferSize, UpstreamBufferSize);
9999
if (!m_utils)
100100
return logFail("Failed to create Utilities!");
101101
m_upStreamingBuffer = m_utils->getDefaultUpStreamingBuffer();

12_MeshLoaders/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ endif()
1515
# TODO; Arek I removed `NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET` from the last parameter here, doesn't this macro have 4 arguments anyway !?
1616
nbl_create_executable_project("" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_LIBRARIES}")
1717
# TODO: Arek temporarily disabled cause I haven't figured out how to make this target yet
18-
# LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} nblExamplesGeometrySpirvBRD)
18+
# LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} nblExamplesGeometrySpirvBRD)
19+
20+
add_dependencies(${EXECUTABLE_NAME} argparse)
21+
target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:argparse,INTERFACE_INCLUDE_DIRECTORIES>)

0 commit comments

Comments
 (0)