AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

metal boo lambda sync

This commit is contained in:
Jack Andersen 2016-03-30 11:08:29 -10:00
parent fb7ae9ac87
commit 05e18ddfe8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
specter/lib/TextView.cpp
View File

@ -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::UV4 | boo::VertexSemantic::Instanced, 3},
{nullptr, nullptr, boo::VertexSemantic::Color | boo::VertexSemantic::Instanced} {nullptr, nullptr, boo::VertexSemantic::Color | boo::VertexSemantic::Instanced}
}; };
m_vtxFmt = factory->newVertexFormat(13, vdescs); m_vtxFmt = ctx.newVertexFormat(13, vdescs);
m_regular = m_regular =
factory->newShaderPipeline(VS, FSReg, m_vtxFmt, 1, ctx.newShaderPipeline(VS, FSReg, m_vtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
boo::Primitive::TriStrips, false, false, false); boo::Primitive::TriStrips, false, false, false);
} }
#endif #endif

16
specter/lib/View.cpp
View File

@ -268,22 +268,22 @@ void View::Resources::init(boo::MetalDataFactory::Context& ctx, const IThemeData
{nullptr, nullptr, boo::VertexSemantic::Position4}, {nullptr, nullptr, boo::VertexSemantic::Position4},
{nullptr, nullptr, boo::VertexSemantic::Color} {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, m_solidShader = ctx.newShaderPipeline(SolidVS, SolidFS, m_solidVtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
boo::Primitive::TriStrips, false, false, false); boo::Primitive::TriStrips, false, false, false);
boo::VertexElementDescriptor texvdescs[] = boo::VertexElementDescriptor texvdescs[] =
{ {
{nullptr, nullptr, boo::VertexSemantic::Position4}, {nullptr, nullptr, boo::VertexSemantic::Position4},
{nullptr, nullptr, boo::VertexSemantic::UV4} {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, m_texShader = ctx.newShaderPipeline(TexVS, TexFS, m_texVtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
boo::Primitive::TriStrips, false, false, false); boo::Primitive::TriStrips, false, false, false);
} }
#endif #endif