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

More graceful OpenGL uniform block binding

This commit is contained in:
Jack Andersen 2016-04-03 19:00:13 -10:00
parent af188afc81
commit 54ae8c2b1a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/graphicsdev/GL.cpp
View File

@ -599,27 +599,33 @@ struct GLShaderDataBinding : IShaderDataBinding
m_vtxFormat->bind(b); m_vtxFormat->bind(b);
if (m_ubufOffs.size()) if (m_ubufOffs.size())
{ {
for (size_t i=0 ; i<m_ubufCount ; ++i) for (size_t i=0 ; i<m_ubufCount && i<m_pipeline->m_uniLocs.size() ; ++i)
{ {
GLint loc = m_pipeline->m_uniLocs[i];
if (loc < 0)
continue;
IGraphicsBuffer* ubuf = m_ubufs[i]; IGraphicsBuffer* ubuf = m_ubufs[i];
const std::pair<size_t,size_t>& offset = m_ubufOffs[i]; const std::pair<size_t,size_t>& offset = m_ubufOffs[i];
if (ubuf->dynamic()) if (ubuf->dynamic())
static_cast<GLGraphicsBufferD*>(ubuf)->bindUniformRange(i, offset.first, offset.second, b); static_cast<GLGraphicsBufferD*>(ubuf)->bindUniformRange(i, offset.first, offset.second, b);
else else
static_cast<GLGraphicsBufferS*>(ubuf)->bindUniformRange(i, offset.first, offset.second); static_cast<GLGraphicsBufferS*>(ubuf)->bindUniformRange(i, offset.first, offset.second);
glUniformBlockBinding(prog, m_pipeline->m_uniLocs.at(i), i); glUniformBlockBinding(prog, loc, i);
} }
} }
else else
{ {
for (size_t i=0 ; i<m_ubufCount ; ++i) for (size_t i=0 ; i<m_ubufCount && i<m_pipeline->m_uniLocs.size() ; ++i)
{ {
GLint loc = m_pipeline->m_uniLocs[i];
if (loc < 0)
continue;
IGraphicsBuffer* ubuf = m_ubufs[i]; IGraphicsBuffer* ubuf = m_ubufs[i];
if (ubuf->dynamic()) if (ubuf->dynamic())
static_cast<GLGraphicsBufferD*>(ubuf)->bindUniform(i, b); static_cast<GLGraphicsBufferD*>(ubuf)->bindUniform(i, b);
else else
static_cast<GLGraphicsBufferS*>(ubuf)->bindUniform(i); static_cast<GLGraphicsBufferS*>(ubuf)->bindUniform(i);
glUniformBlockBinding(prog, m_pipeline->m_uniLocs.at(i), i); glUniformBlockBinding(prog, loc, i);
} }
} }
for (size_t i=0 ; i<m_texCount ; ++i) for (size_t i=0 ; i<m_texCount ; ++i)