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

Vulkan API sync

This commit is contained in:
Jack Andersen 2016-04-03 20:37:15 -10:00
parent a7cf3fafa8
commit c26a288a8c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Graphics/CLineRendererShadersGLSL.cpp
View File

@ -162,7 +162,7 @@ struct VulkanLineDataBindingFactory : CLineRendererShaders::IDataBindingFactory
renderer.m_shaderBind = ctx.newShaderDataBinding(pipeline, nullptr, renderer.m_vertBuf, renderer.m_shaderBind = ctx.newShaderDataBinding(pipeline, nullptr, renderer.m_vertBuf,
nullptr, nullptr, 1, uniforms, nullptr, nullptr, 1, uniforms,
texCount, textures); nullptr, texCount, textures);
} }
}; };

4
Runtime/Particle/CElementGenShadersGLSL.cpp
View File

@ -373,11 +373,11 @@ struct VulkanElementDataBindingFactory : CElementGenShaders::IDataBindingFactory
if (regPipeline) if (regPipeline)
gen.m_normalDataBind = ctx.newShaderDataBinding(regPipeline, nullptr, nullptr, gen.m_normalDataBind = ctx.newShaderDataBinding(regPipeline, nullptr, nullptr,
gen.m_instBuf, nullptr, 1, uniforms, gen.m_instBuf, nullptr, 1, uniforms,
texCount, textures); nullptr, texCount, textures);
if (redToAlphaPipeline) if (redToAlphaPipeline)
gen.m_redToAlphaDataBind = ctx.newShaderDataBinding(redToAlphaPipeline, nullptr, nullptr, gen.m_redToAlphaDataBind = ctx.newShaderDataBinding(redToAlphaPipeline, nullptr, nullptr,
gen.m_instBuf, nullptr, 1, uniforms, gen.m_instBuf, nullptr, 1, uniforms,
texCount, textures); nullptr, texCount, textures);
} }
}; };

2
hecl

@ -1 +1 @@
Subproject commit 153be7f1d35f3b71b5649fa8f169ceda2357eb08 Subproject commit 115b998e207dfaf095a987dbe0e21fb40e4f0e52