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

Merge pull request #329 from MikePopoloski/master

Browse Source 
Allow the max draw call count to go above 65k.
This commit is contained in:
Branimir Karadžić 2015-04-09 16:44:47 -07:00
commit 99c645a353
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bgfx_p.h
View File

@ -215,6 +215,12 @@ namespace stl
# define BGFX_RENDERER_OPENGL_NAME "OpenGL" # define BGFX_RENDERER_OPENGL_NAME "OpenGL"
#endif // #endif //
#if BGFX_CONFIG_MAX_DRAW_CALLS < (64<<10)
typedef uint16_t DrawCountType;
#else
typedef uint32_t DrawCountType;
#endif
namespace bgfx namespace bgfx
{ {
#if BX_PLATFORM_ANDROID #if BX_PLATFORM_ANDROID
@ -1617,7 +1623,7 @@ namespace bgfx
uint8_t m_viewFlags[BGFX_CONFIG_MAX_VIEWS]; uint8_t m_viewFlags[BGFX_CONFIG_MAX_VIEWS];
uint64_t m_sortKeys[BGFX_CONFIG_MAX_DRAW_CALLS+1]; uint64_t m_sortKeys[BGFX_CONFIG_MAX_DRAW_CALLS+1];
uint16_t m_sortValues[BGFX_CONFIG_MAX_DRAW_CALLS+1]; DrawCountType m_sortValues[BGFX_CONFIG_MAX_DRAW_CALLS+1];
RenderItem m_renderItem[BGFX_CONFIG_MAX_DRAW_CALLS+1]; RenderItem m_renderItem[BGFX_CONFIG_MAX_DRAW_CALLS+1];
RenderDraw m_draw; RenderDraw m_draw;
RenderCompute m_compute; RenderCompute m_compute;
@ -1627,9 +1633,9 @@ namespace bgfx
ConstantBuffer* m_constantBuffer; ConstantBuffer* m_constantBuffer;
uint16_t m_num; DrawCountType m_num;
uint16_t m_numRenderItems; DrawCountType m_numRenderItems;
uint16_t m_numDropped; DrawCountType m_numDropped;
MatrixCache m_matrixCache; MatrixCache m_matrixCache;
RectCache m_rectCache; RectCache m_rectCache;
@ -3424,7 +3430,7 @@ namespace bgfx
Frame* m_submit; Frame* m_submit;
uint64_t m_tempKeys[BGFX_CONFIG_MAX_DRAW_CALLS]; uint64_t m_tempKeys[BGFX_CONFIG_MAX_DRAW_CALLS];
uint16_t m_tempValues[BGFX_CONFIG_MAX_DRAW_CALLS]; DrawCountType m_tempValues[BGFX_CONFIG_MAX_DRAW_CALLS];
VertexBuffer m_vertexBuffers[BGFX_CONFIG_MAX_VERTEX_BUFFERS]; VertexBuffer m_vertexBuffers[BGFX_CONFIG_MAX_VERTEX_BUFFERS];