scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-25 09:08:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
Branimir Karadžić 2015-01-23 22:42:15 -08:00
commit ae56ff38ac
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/bgfx.h
View file

@ -324,8 +324,8 @@ namespace bgfx
{ {
uint8_t* data; uint8_t* data;
uint32_t size; uint32_t size;
IndexBufferHandle handle;
uint32_t startIndex; uint32_t startIndex;
IndexBufferHandle handle;
}; };
/// ///

2
src/bgfx.cpp
View file

@ -2746,7 +2746,7 @@ again:
{ {
BGFX_CHECK_MAIN_THREAD(); BGFX_CHECK_MAIN_THREAD();
BX_CHECK(NULL != _tvb, "_tvb can't be NULL"); BX_CHECK(NULL != _tvb, "_tvb can't be NULL");
s_ctx->setVertexBuffer(_tvb, _tvb->startVertex + _startVertex, _numVertices); s_ctx->setVertexBuffer(_tvb, _startVertex, _numVertices);
} }
void setInstanceDataBuffer(const InstanceDataBuffer* _idb, uint32_t _num) void setInstanceDataBuffer(const InstanceDataBuffer* _idb, uint32_t _num)

8
src/bgfx_p.h
View file

@ -1365,7 +1365,7 @@ namespace bgfx
void setVertexBuffer(const TransientVertexBuffer* _tvb, uint32_t _startVertex, uint32_t _numVertices) void setVertexBuffer(const TransientVertexBuffer* _tvb, uint32_t _startVertex, uint32_t _numVertices)
{ {
m_draw.m_startVertex = _startVertex; m_draw.m_startVertex = _tvb->startVertex + _startVertex;
m_draw.m_numVertices = bx::uint32_min(_tvb->size/_tvb->stride, _numVertices); m_draw.m_numVertices = bx::uint32_min(_tvb->size/_tvb->stride, _numVertices);
m_draw.m_vertexBuffer = _tvb->handle; m_draw.m_vertexBuffer = _tvb->handle;
m_draw.m_vertexDecl = _tvb->decl; m_draw.m_vertexDecl = _tvb->decl;
@ -2017,7 +2017,7 @@ namespace bgfx
BGFX_API_FUNC(DynamicIndexBufferHandle createDynamicIndexBuffer(uint32_t _num, uint8_t _flags) ) BGFX_API_FUNC(DynamicIndexBufferHandle createDynamicIndexBuffer(uint32_t _num, uint8_t _flags) )
{ {
DynamicIndexBufferHandle handle = BGFX_INVALID_HANDLE; DynamicIndexBufferHandle handle = BGFX_INVALID_HANDLE;
uint32_t size = BX_ALIGN_16(_num*2); uint32_t size = BX_ALIGN_16( (_num+1)*2);
uint64_t ptr = 0; uint64_t ptr = 0;
if (0 != (_flags & BGFX_BUFFER_COMPUTE_WRITE)) if (0 != (_flags & BGFX_BUFFER_COMPUTE_WRITE))
@ -2334,8 +2334,8 @@ namespace bgfx
uint32_t offset = m_submit->allocTransientVertexBuffer(_num, _decl.m_stride); uint32_t offset = m_submit->allocTransientVertexBuffer(_num, _decl.m_stride);
_tvb->data = &dvb.data[offset]; _tvb->data = &dvb.data[offset];
_tvb->size = _num * _decl.m_stride; _tvb->size = (_num+1) * _decl.m_stride;
_tvb->startVertex = offset/_decl.m_stride; _tvb->startVertex = strideAlign(offset, _decl.m_stride)/_decl.m_stride;
_tvb->stride = _decl.m_stride; _tvb->stride = _decl.m_stride;
_tvb->handle = dvb.handle; _tvb->handle = dvb.handle;
_tvb->decl = declHandle; _tvb->decl = declHandle;