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

Update shader pipeline calls

This commit is contained in:
Jack Andersen 2016-03-23 22:06:52 -10:00
parent fcd2a4ceba
commit 23977d6097
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
specter/lib/TextView.cpp
View File

@ -74,12 +74,12 @@ void TextView::Resources::init(boo::GLDataFactory* factory, FontCache* fcache)
m_regular = m_regular =
factory->newShaderPipeline(GLSLVS, GLSLFSReg, 1, "fontTex", 1, BlockNames, factory->newShaderPipeline(GLSLVS, GLSLFSReg, 1, "fontTex", 1, BlockNames,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
m_subpixel = m_subpixel =
factory->newShaderPipeline(GLSLVS, GLSLFSSubpixel, 1, "fontTex", 1, BlockNames, factory->newShaderPipeline(GLSLVS, GLSLFSSubpixel, 1, "fontTex", 1, BlockNames,
boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1, boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1,
false, false, false); boo::Primitive::TriStrips, false, false, false);
} }
#if _WIN32 #if _WIN32
@ -258,7 +258,7 @@ void TextView::Resources::init(boo::MetalDataFactory* factory, FontCache* fcache
m_regular = m_regular =
factory->newShaderPipeline(VS, FSReg, m_vtxFmt, 1, factory->newShaderPipeline(VS, FSReg, m_vtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
} }
#endif #endif

8
specter/lib/View.cpp
View File

@ -77,11 +77,11 @@ void View::Resources::init(boo::GLDataFactory* factory, const IThemeData& theme)
m_solidShader = factory->newShaderPipeline(GLSLSolidVS, GLSLSolidFS, 0, nullptr, 1, BlockNames, m_solidShader = factory->newShaderPipeline(GLSLSolidVS, GLSLSolidFS, 0, nullptr, 1, BlockNames,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
m_texShader = factory->newShaderPipeline(GLSLTexVS, GLSLTexFS, 1, "tex", 1, BlockNames, m_texShader = factory->newShaderPipeline(GLSLTexVS, GLSLTexFS, 1, "tex", 1, BlockNames,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
} }
#if _WIN32 #if _WIN32
@ -272,7 +272,7 @@ void View::Resources::init(boo::MetalDataFactory* factory, const IThemeData& the
m_solidShader = factory->newShaderPipeline(SolidVS, SolidFS, m_solidVtxFmt, 1, m_solidShader = factory->newShaderPipeline(SolidVS, SolidFS, m_solidVtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
boo::VertexElementDescriptor texvdescs[] = boo::VertexElementDescriptor texvdescs[] =
{ {
@ -283,7 +283,7 @@ void View::Resources::init(boo::MetalDataFactory* factory, const IThemeData& the
m_texShader = factory->newShaderPipeline(TexVS, TexFS, m_texVtxFmt, 1, m_texShader = factory->newShaderPipeline(TexVS, TexFS, m_texVtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
} }
#endif #endif