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

Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Jack Andersen 2018-01-07 09:55:41 -10:00
parent 9bdb1cd1a5 c38c998a51
commit 92b640214a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/Graphics/Shaders/CTexturedQuadFilterGLSL.cpp
View File

@ -184,7 +184,8 @@ struct CTexturedQuadFilterVulkanDataBindingFactory : TMultiBlendShader<CTextured
boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {filter.m_uniBuf.get()}; boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {filter.m_uniBuf.get()};
boo::ObjToken<boo::ITexture> texs[] = {filter.m_booTex.get()}; boo::ObjToken<boo::ITexture> texs[] = {filter.m_booTex.get()};
return cctx.newShaderDataBinding(SelectPipeline(type, filter.m_gequal), s_VtxFmt, return cctx.newShaderDataBinding(SelectPipeline(type, filter.m_gequal,
filter.m_booTex->type() == boo::TextureType::Render), s_VtxFmt,
filter.m_vbo.get(), nullptr, nullptr, 1, bufs, filter.m_vbo.get(), nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr); nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr);
} }

2
amuse

@ -1 +1 @@
Subproject commit 380381c7d1865cc069317c258ae740a789baf8c9 Subproject commit fd292491c7023330ca6aced4955eabb23cc4123e

2
hecl

@ -1 +1 @@
Subproject commit 9823ddeec4875d15b41de1dc5c61a814be8a5192 Subproject commit 5231817e2f81148a60b0c81a554455be01a70e7f