mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed MSVC build.

Browse Source
This commit is contained in:
Branimir Karadžić 2021-05-19 07:03:02 -07:00
parent d53cd6bc42
commit c5aea5325d
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/renderer_gl.cpp
View File

@ -5135,6 +5135,11 @@ namespace bgfx { namespace gl
m_instanceData[used] = -1;
}
void ProgramGL::bindAttributesBegin()
{
bx::memCopy(m_unboundUsedAttrib, m_used, sizeof(m_unboundUsedAttrib));
}
void ProgramGL::bindAttributes(const VertexLayout& _layout, uint32_t _baseVertex)
{
for (uint32_t ii = 0, iiEnd = m_usedCount; ii < iiEnd; ++ii)
@ -5184,6 +5189,34 @@ namespace bgfx { namespace gl
}
}
void ProgramGL::bindInstanceData(uint32_t _stride, uint32_t _baseVertex) const
{
uint32_t baseVertex = _baseVertex;
for (uint32_t ii = 0; -1 != m_instanceData[ii]; ++ii)
{
GLint loc = m_instanceData[ii];
lazyEnableVertexAttribArray(loc);
GL_CHECK(glVertexAttribPointer(loc, 4, GL_FLOAT, GL_FALSE, _stride, (void*)(uintptr_t)baseVertex));
GL_CHECK(glVertexAttribDivisor(loc, 1));
baseVertex += 16;
}
}
void ProgramGL::bindAttributesEnd()
{
for (uint32_t ii = 0, iiEnd = m_usedCount; ii < iiEnd; ++ii)
{
if (Attrib::Count != m_unboundUsedAttrib[ii])
{
Attrib::Enum attr = Attrib::Enum(m_unboundUsedAttrib[ii]);
GLint loc = m_attributes[attr];
lazyDisableVertexAttribArray(loc);
}
}
applyLazyEnabledVertexAttributes();
}
void ProgramGL::unbindAttributes()
{
for(uint32_t ii = 0, iiEnd = m_usedCount; ii < iiEnd; ++ii)
@ -5197,19 +5230,6 @@ namespace bgfx { namespace gl
}
}
void ProgramGL::bindInstanceData(uint32_t _stride, uint32_t _baseVertex) const
{
uint32_t baseVertex = _baseVertex;
for (uint32_t ii = 0; -1 != m_instanceData[ii]; ++ii)
{
GLint loc = m_instanceData[ii];
lazyEnableVertexAttribArray(loc);
GL_CHECK(glVertexAttribPointer(loc, 4, GL_FLOAT, GL_FALSE, _stride, (void*)(uintptr_t)baseVertex) );
GL_CHECK(glVertexAttribDivisor(loc, 1) );
baseVertex += 16;
}
}
void ProgramGL::unbindInstanceData() const
{
for(uint32_t ii = 0; -1 != m_instanceData[ii]; ++ii)

28
src/renderer_gl.h
View File

@ -1484,32 +1484,12 @@ namespace bgfx { namespace gl
void create(const ShaderGL& _vsh, const ShaderGL& _fsh);
void destroy();
void init();
void bindInstanceData(uint32_t _stride, uint32_t _baseVertex = 0) const;
void unbindInstanceData() const;
void bindAttributesBegin()
{
bx::memCopy(m_unboundUsedAttrib, m_used, sizeof(m_unboundUsedAttrib) );
}
void bindAttributesBegin();
void bindAttributes(const VertexLayout& _layout, uint32_t _baseVertex = 0);
void bindAttributesEnd()
{
for (uint32_t ii = 0, iiEnd = m_usedCount; ii < iiEnd; ++ii)
{
if (Attrib::Count != m_unboundUsedAttrib[ii])
{
Attrib::Enum attr = Attrib::Enum(m_unboundUsedAttrib[ii]);
GLint loc = m_attributes[attr];
lazyDisableVertexAttribArray(loc);
}
}
extern void applyLazyEnabledVertexAttributes();
applyLazyEnabledVertexAttributes();
}
void bindInstanceData(uint32_t _stride, uint32_t _baseVertex = 0) const;
void bindAttributesEnd();
void unbindInstanceData() const;
void unbindAttributes();
GLuint m_id;