@@ -7,13 +7,14 @@
namespace anki {
-static constexpr Array<GpuMemoryManagerClassInfo, 7> CLASSES{{{256_B, 16_KB},
+static constexpr Array<GpuMemoryManagerClassInfo, 8> CLASSES{{{256_B, 16_KB},
{4_KB, 256_KB},
{128_KB, 8_MB},
{1_MB, 64_MB},
{16_MB, 128_MB},
{64_MB, 256_MB},
- {128_MB, 256_MB}}};
+ {128_MB, 256_MB},
+ {256_MB, 256_MB}}};
/// Special classes for the ReBAR memory. Have that as a special case because it's so limited and needs special care.
static constexpr Array<GpuMemoryManagerClassInfo, 3> REBAR_CLASSES{{{1_MB, 1_MB}, {12_MB, 12_MB}, {24_MB, 24_MB}}};
@@ -79,11 +79,11 @@ public:
void setupRenderableQueueElement(RenderableQueueElement& el) const
{
- ANKI_ASSERT(el.m_callback != nullptr);
+ ANKI_ASSERT(m_callback != nullptr);
el.m_callback = m_callback;
- ANKI_ASSERT(el.m_userData != nullptr);
+ ANKI_ASSERT(m_userData != nullptr);
el.m_userData = m_userData;
- ANKI_ASSERT(el.m_mergeKey != MAX_U64);
+ ANKI_ASSERT(m_mergeKey != MAX_U64);
el.m_mergeKey = m_mergeKey;
el.m_distanceFromCamera = -1.0f;
el.m_lod = MAX_U8;
@@ -161,10 +161,10 @@ Error MyApp::userMainLoop(Bool& quit, Second elapsedTime)
renderer.getDbg().switchDepthTestEnabled();
}
- if(in.getKey(KeyCode::F12) == 1)
+ /*if(in.getKey(KeyCode::F12) == 1)
TracerSingleton::get().setEnabled(!TracerSingleton::get().getEnabled());
- }
+ }*/
#if !PLAYER
static F32 dist = 0.1f;
@@ -229,7 +229,7 @@ Error MyApp::userMainLoop(Bool& quit, Second elapsedTime)
if(in.getKey(KeyCode::U) == 1)
renderer.setCurrentDebugRenderTarget(
- (renderer.getCurrentDebugRenderTarget() == "IndirectDiffuse") ? "" : "IndirectDiffuse");
+ (renderer.getCurrentDebugRenderTarget() == "GBuffer_albedo") ? "" : "GBuffer_albedo");
if(in.getKey(KeyCode::I) == 1)