From a09d042a3db1e7c2876a5bad5eb4e15453485cce Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 23 Mar 2016 22:06:24 -1000 Subject: [PATCH] Update shader pipeline calls --- hecl/extern/boo | 2 +- hecl/lib/Backend/GLSL.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hecl/extern/boo b/hecl/extern/boo index ca3880577..6600ff208 160000 --- a/hecl/extern/boo +++ b/hecl/extern/boo @@ -1 +1 @@ -Subproject commit ca38805776c814034af28f68144de64868601da1 +Subproject commit 6600ff208cad0f506cde16ac26cdc86b4d9d7070 diff --git a/hecl/lib/Backend/GLSL.cpp b/hecl/lib/Backend/GLSL.cpp index dfa1e0038..1e37ee540 100644 --- a/hecl/lib/Backend/GLSL.cpp +++ b/hecl/lib/Backend/GLSL.cpp @@ -276,7 +276,7 @@ struct GLSLBackendFactory : IShaderBackendFactory m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(), m_backend.m_texMapEnd, "texs", 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.getBackfaceCulling()); if (!objOut) @@ -306,7 +306,7 @@ struct GLSLBackendFactory : IShaderBackendFactory m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(), texMapEnd, "texs", 1, STD_BLOCKNAMES, - blendSrc, blendDst, + blendSrc, blendDst, boo::Primitive::TriStrips, tag.getDepthTest(), tag.getDepthWrite(), tag.getBackfaceCulling()); if (!ret) @@ -339,7 +339,7 @@ struct GLSLBackendFactory : IShaderBackendFactory m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSources.back().c_str(), m_backend.m_texMapEnd, "texs", 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.getBackfaceCulling()); if (!ret) @@ -376,7 +376,7 @@ struct GLSLBackendFactory : IShaderBackendFactory m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(), texMapEnd, "texs", 1, STD_BLOCKNAMES, - blendSrc, blendDst, + blendSrc, blendDst, boo::Primitive::TriStrips, tag.getDepthTest(), tag.getDepthWrite(), tag.getBackfaceCulling()); if (!ret)