diff --git a/specter/lib/TextView.cpp b/specter/lib/TextView.cpp index 6e2ce61ef..c70081e91 100644 --- a/specter/lib/TextView.cpp +++ b/specter/lib/TextView.cpp @@ -171,18 +171,13 @@ void TextView::Resources::init(boo::ID3DDataFactory::Context& ctx, FontCache* fc }; m_vtxFmt = ctx.newVertexFormat(13, vdescs); - ComPtr blobVert; - ComPtr blobFrag; - ComPtr blobPipe; m_regular = - ctx.newShaderPipeline(VS, FSReg, blobVert, blobFrag, blobPipe, m_vtxFmt, + ctx.newShaderPipeline(VS, FSReg, nullptr, nullptr, nullptr, m_vtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, false, false, false); - blobFrag.Reset(); - blobPipe.Reset(); m_subpixel = - ctx.newShaderPipeline(nullptr, FSSubpixel, blobVert, blobFrag, blobPipe, m_vtxFmt, + ctx.newShaderPipeline(VS, FSSubpixel, nullptr, nullptr, nullptr, m_vtxFmt, boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1, boo::Primitive::TriStrips, false, false, false); } diff --git a/specter/lib/View.cpp b/specter/lib/View.cpp index a40220765..f9a38623e 100644 --- a/specter/lib/View.cpp +++ b/specter/lib/View.cpp @@ -166,10 +166,7 @@ void View::Resources::init(boo::ID3DDataFactory::Context& ctx, const IThemeData& }; m_solidVtxFmt = ctx.newVertexFormat(2, solidvdescs); - ComPtr vertBlob; - ComPtr fragBlob; - ComPtr 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); }