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 'dev'

Browse source
This commit is contained in:
Branimir Karadžić 2015-11-05 22:25:22 -08:00
commit 7e55edf5c1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bgfx_p.h
View file

@ -826,7 +826,7 @@ namespace bgfx
uint32_t reserve(uint16_t* _num) uint32_t reserve(uint16_t* _num)
{ {
uint32_t num = *_num; uint32_t num = *_num;
BX_CHECK(m_num+num < BGFX_CONFIG_MAX_MATRIX_CACHE, "Matrix cache overflow. %d (max: %d)", m_num+num, BGFX_CONFIG_MAX_MATRIX_CACHE); BX_WARN(m_num+num < BGFX_CONFIG_MAX_MATRIX_CACHE, "Matrix cache overflow. %d (max: %d)", m_num+num, BGFX_CONFIG_MAX_MATRIX_CACHE);
num = bx::uint32_min(num, BGFX_CONFIG_MAX_MATRIX_CACHE-m_num); num = bx::uint32_min(num, BGFX_CONFIG_MAX_MATRIX_CACHE-m_num);
uint32_t first = m_num; uint32_t first = m_num;
m_num += num; m_num += num;

2
src/config.h
View file

@ -195,7 +195,7 @@
#endif // BGFX_CONFIG_MAX_DRAW_CALLS #endif // BGFX_CONFIG_MAX_DRAW_CALLS
#ifndef BGFX_CONFIG_MAX_BLIT_ITEMS #ifndef BGFX_CONFIG_MAX_BLIT_ITEMS
# define BGFX_CONFIG_MAX_BLIT_ITEMS 256 # define BGFX_CONFIG_MAX_BLIT_ITEMS (1<<10)
#endif // BGFX_CONFIG_MAX_BLIT_ITEMS #endif // BGFX_CONFIG_MAX_BLIT_ITEMS
#ifndef BGFX_CONFIG_MAX_MATRIX_CACHE #ifndef BGFX_CONFIG_MAX_MATRIX_CACHE