Skip to content

Commit 85a8163

Browse files
fix up API in ex 44
1 parent 56018c4 commit 85a8163

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

examples_tests/39.DenoiserTonemapper/CommandLineHandler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <chrono>
77
#include "irrlicht.h"
88
#include "irr/core/core.h"
9-
#include "../../ext/MitsubaLoader/CMitsubaLoader.h"
9+
#include "irr/ext/MitsubaLoader/CMitsubaLoader.h"
1010

1111
#define PROPER_CMD_ARGUMENTS_AMOUNT 14
1212
#define MANDATORY_CMD_ARGUMENTS_AMOUNT 8

examples_tests/44.LevelCurveExtraction/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void SaveBufferToCSV(video::IVideoDriver* driver, size_t mdiIndex, video::IGPUBu
159159
auto getData = [&alignment,timeoutInNanoSeconds,downloadStagingArea,driver, downBuffer](video::IGPUBuffer* buf, const uint32_t origOffset, const uint32_t bytelen) -> void*
160160
{
161161
uint32_t address = std::remove_pointer<decltype(downloadStagingArea)>::type::invalid_address;
162-
auto unallocatedSize = downloadStagingArea->multi_alloc(std::chrono::nanoseconds(timeoutInNanoSeconds), 1u, &address, &bytelen, &alignment);
162+
auto unallocatedSize = downloadStagingArea->multi_alloc(1u, &address, &bytelen, &alignment);
163163
if (unallocatedSize)
164164
{
165165
os::Printer::log("Could not download the buffer from the GPU!", ELL_ERROR);

include/irr/video/alloc/SubAllocatedDataBuffer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ class SubAllocatedDataBuffer : public virtual core::IReferenceCounted, protected
197197
template<typename... Args>
198198
inline size_type multi_alloc(uint32_t count, Args&&... args) noexcept
199199
{
200-
auto maxWaitPoint = GPUEventWrapper::default_wait();
201-
return multi_alloc<decltype(maxWaitPoint)::clock,decltype(maxWaitPoint)::duration,Args...>(maxWaitPoint,count,std::forward<Args>(args)...);
200+
return multi_alloc(GPUEventWrapper::default_wait(),count,std::forward<Args>(args)...);
202201
}
203202
//!
204203
template<class Clock=std::chrono::steady_clock, class Duration=typename Clock::duration, typename... Args>

0 commit comments

Comments
 (0)