diff --git a/specter/lib/TextView.cpp b/specter/lib/TextView.cpp index 114edbb1f..fb81ab3ba 100644 --- a/specter/lib/TextView.cpp +++ b/specter/lib/TextView.cpp @@ -253,12 +253,12 @@ void TextView::Resources::init(boo::MetalDataFactory::Context& ctx, FontCache* f {nullptr, nullptr, boo::VertexSemantic::UV4 | boo::VertexSemantic::Instanced, 3}, {nullptr, nullptr, boo::VertexSemantic::Color | boo::VertexSemantic::Instanced} }; - m_vtxFmt = factory->newVertexFormat(13, vdescs); + m_vtxFmt = ctx.newVertexFormat(13, vdescs); m_regular = - factory->newShaderPipeline(VS, FSReg, m_vtxFmt, 1, - boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + ctx.newShaderPipeline(VS, FSReg, m_vtxFmt, 1, + boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, + boo::Primitive::TriStrips, false, false, false); } #endif diff --git a/specter/lib/View.cpp b/specter/lib/View.cpp index f05b682b6..233666b00 100644 --- a/specter/lib/View.cpp +++ b/specter/lib/View.cpp @@ -268,22 +268,22 @@ void View::Resources::init(boo::MetalDataFactory::Context& ctx, const IThemeData {nullptr, nullptr, boo::VertexSemantic::Position4}, {nullptr, nullptr, boo::VertexSemantic::Color} }; - m_solidVtxFmt = factory->newVertexFormat(2, solidvdescs); + m_solidVtxFmt = ctx.newVertexFormat(2, solidvdescs); - m_solidShader = factory->newShaderPipeline(SolidVS, SolidFS, m_solidVtxFmt, 1, - boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + m_solidShader = ctx.newShaderPipeline(SolidVS, SolidFS, m_solidVtxFmt, 1, + boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, + boo::Primitive::TriStrips, false, false, false); boo::VertexElementDescriptor texvdescs[] = { {nullptr, nullptr, boo::VertexSemantic::Position4}, {nullptr, nullptr, boo::VertexSemantic::UV4} }; - m_texVtxFmt = factory->newVertexFormat(2, texvdescs); + m_texVtxFmt = ctx.newVertexFormat(2, texvdescs); - m_texShader = factory->newShaderPipeline(TexVS, TexFS, m_texVtxFmt, 1, - boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + m_texShader = ctx.newShaderPipeline(TexVS, TexFS, m_texVtxFmt, 1, + boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, + boo::Primitive::TriStrips, false, false, false); } #endif