scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:bkaradzic/bgfx

Browse source
This commit is contained in:
Branimir Karadžić 2015-07-17 19:20:22 -07:00
commit 0abf787274
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/renderer_gl.cpp
View file

@ -3410,6 +3410,10 @@ namespace bgfx { namespace gl
m_used[used++] = ii; m_used[used++] = ii;
} }
} }
BX_CHECK(used < BX_COUNTOF(m_used), "Out of bounds %d > array size %d."
, used
, BX_COUNTOF(m_used)
);
m_used[used] = Attrib::Count; m_used[used] = Attrib::Count;
used = 0; used = 0;
@ -3422,6 +3426,10 @@ namespace bgfx { namespace gl
m_instanceData[used++] = loc; m_instanceData[used++] = loc;
} }
} }
BX_CHECK(used < BX_COUNTOF(m_instanceData), "Out of bounds %d > array size %d."
, used
, BX_COUNTOF(m_instanceData)
);
m_instanceData[used] = 0xffff; m_instanceData[used] = 0xffff;
} }

2
src/renderer_gl.h
View file

@ -1061,7 +1061,7 @@ namespace bgfx { namespace gl
uint8_t m_used[Attrib::Count+1]; // dense uint8_t m_used[Attrib::Count+1]; // dense
GLint m_attributes[Attrib::Count]; // sparse GLint m_attributes[Attrib::Count]; // sparse
GLint m_instanceData[BGFX_CONFIG_MAX_INSTANCE_DATA_COUNT]; GLint m_instanceData[BGFX_CONFIG_MAX_INSTANCE_DATA_COUNT+1];
GLint m_sampler[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS]; GLint m_sampler[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS];
uint8_t m_numSamplers; uint8_t m_numSamplers;