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
jackoalan committed Mar 24, 2016
1 parent 83eae36 commit b413680
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion extern/boo
Submodule boo updated 9 files
+1 −1 include/boo/graphicsdev/D3D.hpp
+1 −1 include/boo/graphicsdev/GL.hpp
+7 −0 include/boo/graphicsdev/IGraphicsDataFactory.hpp
+1 −1 include/boo/graphicsdev/Metal.hpp
+1 −1 include/boo/graphicsdev/Vulkan.hpp
+6 −6 lib/audiodev/AQS.cpp
+21 −6 lib/graphicsdev/GL.cpp
+18 −7 lib/graphicsdev/Metal.mm
+13 −12 test/main.cpp
8 changes: 4 additions & 4 deletions lib/Backend/GLSL.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b413680

Please sign in to comment.