Skip to content
This repository has been archived by the owner on Apr 7, 2021. It is now read-only.

Commit

Permalink
Update shader pipeline calls
Browse files Browse the repository at this point in the history
  • Loading branch information
jackoalan committed Mar 24, 2016
1 parent 8a6317a commit d3e4c1a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions lib/TextView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ void TextView::Resources::init(boo::GLDataFactory* factory, FontCache* fcache)
m_regular =
factory->newShaderPipeline(GLSLVS, GLSLFSReg, 1, "fontTex", 1, BlockNames,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
boo::Primitive::TriStrips, false, false, false);

m_subpixel =
factory->newShaderPipeline(GLSLVS, GLSLFSSubpixel, 1, "fontTex", 1, BlockNames,
boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1,
false, false, false);
boo::Primitive::TriStrips, false, false, false);
}

#if _WIN32
Expand Down Expand Up @@ -258,7 +258,7 @@ void TextView::Resources::init(boo::MetalDataFactory* factory, FontCache* fcache
m_regular =
factory->newShaderPipeline(VS, FSReg, m_vtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
boo::Primitive::TriStrips, false, false, false);
}

#endif
Expand Down
8 changes: 4 additions & 4 deletions lib/View.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ void View::Resources::init(boo::GLDataFactory* factory, const IThemeData& theme)

m_solidShader = factory->newShaderPipeline(GLSLSolidVS, GLSLSolidFS, 0, nullptr, 1, BlockNames,
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,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
boo::Primitive::TriStrips, false, false, false);
}

#if _WIN32
Expand Down Expand Up @@ -272,7 +272,7 @@ void View::Resources::init(boo::MetalDataFactory* factory, const IThemeData& the

m_solidShader = factory->newShaderPipeline(SolidVS, SolidFS, m_solidVtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
boo::Primitive::TriStrips, false, false, false);

boo::VertexElementDescriptor texvdescs[] =
{
Expand All @@ -283,7 +283,7 @@ void View::Resources::init(boo::MetalDataFactory* factory, const IThemeData& the

m_texShader = factory->newShaderPipeline(TexVS, TexFS, m_texVtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
boo::Primitive::TriStrips, false, false, false);
}

#endif
Expand Down

0 comments on commit d3e4c1a

Please sign in to comment.