From f41f0e0e77a35cac38e923416353ab783c0c456c Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 19 May 2018 20:13:54 -1000 Subject: [PATCH] Boo resource tracing --- specter/lib/FontCache.cpp | 2 +- specter/lib/ModalWindow.cpp | 2 +- specter/lib/View.cpp | 2 +- specter/lib/ViewResources.cpp | 2 +- specter/zeus | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specter/lib/FontCache.cpp b/specter/lib/FontCache.cpp index 25f9eae72..878e66d83 100644 --- a/specter/lib/FontCache.cpp +++ b/specter/lib/FontCache.cpp @@ -649,7 +649,7 @@ boo::ObjToken FontAtlas::texture(boo::IGraphicsDataFactory* gf) return {}; if (m_tex) return m_tex; - gf->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) + gf->BooCommitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) { if (m_subpixel) const_cast&>(m_tex) = diff --git a/specter/lib/ModalWindow.cpp b/specter/lib/ModalWindow.cpp index 5d0f836d0..596485344 100644 --- a/specter/lib/ModalWindow.cpp +++ b/specter/lib/ModalWindow.cpp @@ -292,7 +292,7 @@ ModalWindow::ModalWindow(ViewResources& res, View& parentView, m_windowBgClear[3] = 0.0; m_line2Clear[3] = 0.0; - res.m_factory->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) -> bool + res.m_factory->BooCommitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) { buildResources(ctx, res); m_viewBlockBuf = res.m_viewRes.m_bufPool.allocateBlock(res.m_factory); diff --git a/specter/lib/View.cpp b/specter/lib/View.cpp index 60c81344b..f938111bb 100644 --- a/specter/lib/View.cpp +++ b/specter/lib/View.cpp @@ -374,7 +374,7 @@ void View::draw(boo::IGraphicsCommandQueue* gfxQ) void View::commitResources(ViewResources& res, const boo::FactoryCommitFunc& commitFunc) { - res.m_factory->commitTransaction(commitFunc); + res.m_factory->BooCommitTransaction(commitFunc); } void View::VertexBufferBindingSolid::init(boo::IGraphicsDataFactory::Context& ctx, diff --git a/specter/lib/ViewResources.cpp b/specter/lib/ViewResources.cpp index 08965cf70..16461f459 100644 --- a/specter/lib/ViewResources.cpp +++ b/specter/lib/ViewResources.cpp @@ -16,7 +16,7 @@ void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache, m_curveFont = fcache->prepCurvesFont(AllCharFilter, false, 8.f, dpi); - factory->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) -> bool { + factory->BooCommitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) { switch (ctx.platform()) { #if BOO_HAS_GL diff --git a/specter/zeus b/specter/zeus index e94de160a..d135dee55 160000 --- a/specter/zeus +++ b/specter/zeus @@ -1 +1 @@ -Subproject commit e94de160ad681fa6c8d943faa22f22c619555ee7 +Subproject commit d135dee556590fee0d5569c0ad7db426274ef1a4