Browse Source

Merge branch 'dev'

Branimir Karadžić 10 years ago
parent
commit
7e55edf5c1
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/bgfx_p.h
  2. 1 1
      src/config.h

+ 1 - 1
src/bgfx_p.h

@@ -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;

+ 1 - 1
src/config.h

@@ -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