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:24 -10:00
parent d35408376c
commit a09d042a3d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit ca38805776c814034af28f68144de64868601da1 Subproject commit 6600ff208cad0f506cde16ac26cdc86b4d9d7070

8
hecl/lib/Backend/GLSL.cpp
View File

@ -276,7 +276,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(), m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(),
m_backend.m_texMapEnd, "texs", m_backend.m_texMapEnd, "texs",
1, STD_BLOCKNAMES, 1, STD_BLOCKNAMES,
m_backend.m_blendSrc, m_backend.m_blendDst, m_backend.m_blendSrc, m_backend.m_blendDst, boo::Primitive::TriStrips,
tag.getDepthTest(), tag.getDepthWrite(), tag.getDepthTest(), tag.getDepthWrite(),
tag.getBackfaceCulling()); tag.getBackfaceCulling());
if (!objOut) if (!objOut)
@ -306,7 +306,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(), m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(),
texMapEnd, "texs", texMapEnd, "texs",
1, STD_BLOCKNAMES, 1, STD_BLOCKNAMES,
blendSrc, blendDst, blendSrc, blendDst, boo::Primitive::TriStrips,
tag.getDepthTest(), tag.getDepthWrite(), tag.getDepthTest(), tag.getDepthWrite(),
tag.getBackfaceCulling()); tag.getBackfaceCulling());
if (!ret) if (!ret)
@ -339,7 +339,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSources.back().c_str(), m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSources.back().c_str(),
m_backend.m_texMapEnd, "texs", m_backend.m_texMapEnd, "texs",
1, STD_BLOCKNAMES, 1, STD_BLOCKNAMES,
m_backend.m_blendSrc, m_backend.m_blendDst, m_backend.m_blendSrc, m_backend.m_blendDst, boo::Primitive::TriStrips,
tag.getDepthTest(), tag.getDepthWrite(), tag.getDepthTest(), tag.getDepthWrite(),
tag.getBackfaceCulling()); tag.getBackfaceCulling());
if (!ret) if (!ret)
@ -376,7 +376,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(), m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(),
texMapEnd, "texs", texMapEnd, "texs",
1, STD_BLOCKNAMES, 1, STD_BLOCKNAMES,
blendSrc, blendDst, blendSrc, blendDst, boo::Primitive::TriStrips,
tag.getDepthTest(), tag.getDepthWrite(), tag.getDepthTest(), tag.getDepthWrite(),
tag.getBackfaceCulling()); tag.getBackfaceCulling());
if (!ret) if (!ret)