scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-03-23 05:15:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow more than 64K instances.

Browse source
This commit is contained in:
Branimir Karadžić 2016-03-01 17:56:04 -08:00
parent 4b790d6d58
commit 0e3436204c
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/bgfx_p.h
View file

@ -1246,8 +1246,8 @@ namespace bgfx
uint32_t m_startVertex; uint32_t m_startVertex;
uint32_t m_numVertices; uint32_t m_numVertices;
uint32_t m_instanceDataOffset; uint32_t m_instanceDataOffset;
uint32_t m_numInstances;
uint16_t m_instanceDataStride; uint16_t m_instanceDataStride;
uint16_t m_numInstances;
uint16_t m_startIndirect; uint16_t m_startIndirect;
uint16_t m_numIndirect; uint16_t m_numIndirect;
uint16_t m_num; uint16_t m_num;
@ -1558,7 +1558,7 @@ namespace bgfx
{ {
m_draw.m_instanceDataOffset = _idb->offset; m_draw.m_instanceDataOffset = _idb->offset;
m_draw.m_instanceDataStride = _idb->stride; m_draw.m_instanceDataStride = _idb->stride;
m_draw.m_numInstances = uint16_t(bx::uint32_min(_idb->num, _num) ); m_draw.m_numInstances = bx::uint32_min(_idb->num, _num);
m_draw.m_instanceDataBuffer = _idb->handle; m_draw.m_instanceDataBuffer = _idb->handle;
BX_FREE(g_allocator, const_cast<InstanceDataBuffer*>(_idb) ); BX_FREE(g_allocator, const_cast<InstanceDataBuffer*>(_idb) );
} }
@ -1567,7 +1567,7 @@ namespace bgfx
{ {
m_draw.m_instanceDataOffset = _startVertex * _stride; m_draw.m_instanceDataOffset = _startVertex * _stride;
m_draw.m_instanceDataStride = _stride; m_draw.m_instanceDataStride = _stride;
m_draw.m_numInstances = uint16_t(_num); m_draw.m_numInstances = _num;
m_draw.m_instanceDataBuffer = _handle; m_draw.m_instanceDataBuffer = _handle;
} }
@ -2498,8 +2498,7 @@ namespace bgfx
BGFX_API_FUNC(DynamicVertexBufferHandle createDynamicVertexBuffer(const Memory* _mem, const VertexDecl& _decl, uint16_t _flags) ) BGFX_API_FUNC(DynamicVertexBufferHandle createDynamicVertexBuffer(const Memory* _mem, const VertexDecl& _decl, uint16_t _flags) )
{ {
uint32_t numVertices = _mem->size/_decl.m_stride; uint32_t numVertices = _mem->size/_decl.m_stride;
BX_CHECK(numVertices <= UINT16_MAX, "Num vertices exceeds maximum (num %d, max %d).", numVertices, UINT16_MAX); DynamicVertexBufferHandle handle = createDynamicVertexBuffer(numVertices, _decl, _flags);
DynamicVertexBufferHandle handle = createDynamicVertexBuffer(uint16_t(numVertices), _decl, _flags);
if (isValid(handle) ) if (isValid(handle) )
{ {
updateDynamicVertexBuffer(handle, 0, _mem); updateDynamicVertexBuffer(handle, 0, _mem);