AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Sync with boo

Browse Source
This commit is contained in:
Jack Andersen
2017-03-05 13:01:57 -10:00
parent 3427d54a7d
commit 93d338ff0c
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
specter/lib/View.cpp
View File

@@ -166,10 +166,7 @@ void View::Resources::init(boo::ID3DDataFactory::Context& ctx, const IThemeData&
};
m_solidVtxFmt = ctx.newVertexFormat(2, solidvdescs);
ComPtr<ID3DBlob> vertBlob;
ComPtr<ID3DBlob> fragBlob;
ComPtr<ID3DBlob> pipeBlob;
m_solidShader = ctx.newShaderPipeline(SolidVS, SolidFS, vertBlob, fragBlob, pipeBlob, m_solidVtxFmt,
m_solidShader = ctx.newShaderPipeline(SolidVS, SolidFS, nullptr, nullptr, nullptr, m_solidVtxFmt,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
boo::Primitive::TriStrips, false, false, false);
@@ -180,10 +177,7 @@ void View::Resources::init(boo::ID3DDataFactory::Context& ctx, const IThemeData&
};
m_texVtxFmt = ctx.newVertexFormat(2, texvdescs);
vertBlob.Reset();
fragBlob.Reset();
pipeBlob.Reset();
m_texShader = ctx.newShaderPipeline(TexVS, TexFS, vertBlob, fragBlob, pipeBlob, m_texVtxFmt,
m_texShader = ctx.newShaderPipeline(TexVS, TexFS, nullptr, nullptr, nullptr, m_texVtxFmt,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
boo::Primitive::TriStrips, false, false, false);
}