Skip to content

Commit ed3c90f

Browse files
committed
fix linux build
1 parent c3e3d59 commit ed3c90f

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

include/hvt/pageableBuffer/pageableBuffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class HVT_API HdPageableBufferBase
152152
{
153153
return (currentFrame - mFrameStamp) > ageLimit;
154154
}
155-
[[nodiscard]] constexpr bool HasValidDiskBuffer() const noexcept
155+
[[nodiscard]] bool HasValidDiskBuffer() const noexcept
156156
{
157157
return mPageHandle && mPageHandle->IsValid();
158158
}

include/hvt/pageableBuffer/pageableBufferManager.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <chrono>
3131
#include <future>
3232
#include <memory>
33+
#include <queue>
3334
#include <thread>
3435
#include <vector>
3536

@@ -87,7 +88,7 @@ class HVT_API HdPageableBufferManager
8788

8889
// Frame stamp management
8990
void AdvanceFrame(uint advanceCount = 1) noexcept { mCurrentFrame += advanceCount; }
90-
[[nodiscard]] uint GetCurrentFrame() const noexcept { return mCurrentFrame; }
91+
[[nodiscard]] constexpr uint GetCurrentFrame() const noexcept { return mCurrentFrame; }
9192

9293
// Strategy access (no runtime changing allowed)
9394
[[nodiscard]] constexpr PagingStrategyType GetPagingStrategy() const noexcept

include/hvt/pageableBuffer/pageableDataSource.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class HVT_API HdPageableBlockDataSource : public PXR_NS::HdBlockDataSource,
185185
public HdPageableBufferBase
186186
{
187187
public:
188-
HD_DECLARE_DATASOURCE(HdPageableBlockDataSource);
188+
HD_DECLARE_DATASOURCE(HdPageableBlockDataSource)
189189

190190
static Handle New(const PXR_NS::SdfPath& primPath,
191191
const std::unique_ptr<HdPageFileManager>& pageFileManager,
@@ -224,9 +224,9 @@ class HVT_API HdMemoryManager
224224
/// Configuration
225225
constexpr int GetAgeLimit() const noexcept { return mBufferManager.GetAgeLimit(); }
226226
void SetFreeCrawlPercentage(float percentage) noexcept { mFreeCrawlPercentage = percentage; }
227-
constexpr float GetFreeCrawlPercentage() const noexcept { return mFreeCrawlPercentage; }
227+
float GetFreeCrawlPercentage() const noexcept { return mFreeCrawlPercentage; }
228228
void SetFreeCrawlInterval(int interval) noexcept { mFreeCrawlInterval = interval; }
229-
constexpr int GetFreeCrawlInterval() const noexcept { return mFreeCrawlInterval; }
229+
int GetFreeCrawlInterval() const noexcept { return mFreeCrawlInterval; }
230230

231231
/// Access to internal managers for utility functions
232232
std::unique_ptr<HdPageFileManager>& GetPageFileManager()
@@ -239,7 +239,7 @@ class HVT_API HdMemoryManager
239239
}
240240

241241
/// Statistics (development purpose only)
242-
constexpr size_t GetTotalBufferCount() const { return mBufferManager.GetBufferCount(); }
242+
size_t GetTotalBufferCount() const { return mBufferManager.GetBufferCount(); }
243243
void PrintMemoryStatistics() const { mBufferManager.PrintCacheStats(); }
244244

245245
private:

include/hvt/pageableBuffer/pageableMemoryMonitor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <hvt/api.h>
1717

1818
#include <atomic>
19+
#include <cstddef>
1920

2021
namespace HVT_NS
2122
{

source/pageableBuffer/pageableDataSource.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,8 @@ std::string HdPageableSampledDataSource::GetBufferKey(Time time) const
284284

285285
HdMemoryManager::HdMemoryManager(
286286
std::filesystem::path pageFileDirectory, size_t sceneMemoryLimit, size_t rendererMemoryLimit) :
287-
mBufferManager({ .pageFileDirectory = pageFileDirectory,
288-
.sceneMemoryLimit = sceneMemoryLimit,
289-
.rendererMemoryLimit = rendererMemoryLimit,
290-
.ageLimit = 20,
291-
.numThreads = 2 })
287+
mBufferManager({ pageFileDirectory, 20 /*ageLimit*/, sceneMemoryLimit, rendererMemoryLimit,
288+
2 /*numThreads*/ })
292289
{
293290
mCleanupThread = std::thread(&HdMemoryManager::BackgroundCleanupLoop, this);
294291
}

0 commit comments

Comments
 (0)