scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-12-01 03:47:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

SortKey: Added configurable depth and sequence masks.

Browse source
This commit is contained in:
Branimir Karadžić 2016-01-26 19:24:30 -08:00
parent d3fed15577
commit c091ddfc05
3 changed files with 39 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/bgfx.cpp
View file

@ -1070,6 +1070,15 @@ namespace bgfx
static void dumpCaps() static void dumpCaps()
{ {
BX_TRACE("Sort key masks:");
BX_TRACE("\t View %016" PRIx64, SORT_KEY_VIEW_MASK);
BX_TRACE("\t Draw bit %016" PRIx64, SORT_KEY_DRAW_BIT);
BX_TRACE("\t Seq %016" PRIx64, SORT_KEY_SEQ_MASK);
BX_TRACE("\tD Trans %016" PRIx64, SORT_KEY_DRAW_TRANS_MASK);
BX_TRACE("\tD Program %016" PRIx64, SORT_KEY_DRAW_PROGRAM_MASK);
BX_TRACE("\tC Program %016" PRIx64, SORT_KEY_COMPUTE_PROGRAM_MASK);
BX_TRACE("\tD Depth %016" PRIx64, SORT_KEY_DRAW_DEPTH_MASK);
BX_TRACE("Supported capabilities (renderer %s, vendor 0x%04x, device 0x%04x):" BX_TRACE("Supported capabilities (renderer %s, vendor 0x%04x, device 0x%04x):"
, s_ctx->m_renderCtx->getRendererName() , s_ctx->m_renderCtx->getRendererName()
, g_caps.vendorId , g_caps.vendorId

28
src/bgfx_p.h
View file

@ -702,26 +702,28 @@ namespace bgfx
void operator=(const CommandBuffer&); void operator=(const CommandBuffer&);
}; };
#define SORT_KEY_DRAW_BIT (UINT64_C(1)<<0x36) #define SORT_KEY_NUM_BITS_TRANS 2
#define SORT_KEY_SEQ_SHIFT 0x2b #define SORT_KEY_DRAW_BIT (UINT64_C(1)<<0x36)
#define SORT_KEY_SEQ_MASK (UINT64_C(0x7ff)<<SORT_KEY_SEQ_SHIFT)
#define SORT_KEY_VIEW_SHIFT 0x37 #define SORT_KEY_VIEW_SHIFT 0x37
#define SORT_KEY_VIEW_MASK ( (uint64_t(BGFX_CONFIG_MAX_VIEWS-1) )<<SORT_KEY_VIEW_SHIFT) #define SORT_KEY_VIEW_MASK ( (uint64_t(BGFX_CONFIG_MAX_VIEWS-1) )<<SORT_KEY_VIEW_SHIFT)
#define SORT_KEY_DRAW_TRANS_SHIFT 0x29 #define SORT_KEY_DRAW_DEPTH_SHIFT 0
#define SORT_KEY_DRAW_TRANS_MASK (UINT64_C(0x3)<<SORT_KEY_DRAW_TRANS_SHIFT) #define SORT_KEY_DRAW_DEPTH_MASK ( ( (UINT64_C(1)<<BGFX_CONFIG_SORT_KEY_NUM_BITS_DEPTH)-1)<<SORT_KEY_DRAW_DEPTH_SHIFT)
#define SORT_KEY_DRAW_PROGRAM_SHIFT 0x20 #define SORT_KEY_DRAW_PROGRAM_SHIFT (SORT_KEY_DRAW_DEPTH_SHIFT+BGFX_CONFIG_SORT_KEY_NUM_BITS_DEPTH)
#define SORT_KEY_DRAW_PROGRAM_MASK ( (uint64_t(BGFX_CONFIG_MAX_PROGRAMS-1) )<<SORT_KEY_DRAW_PROGRAM_SHIFT) #define SORT_KEY_DRAW_PROGRAM_MASK ( (uint64_t(BGFX_CONFIG_MAX_PROGRAMS-1) )<<SORT_KEY_DRAW_PROGRAM_SHIFT)
#define SORT_KEY_DRAW_DEPTH_SHIFT 0 #define SORT_KEY_COMPUTE_PROGRAM_SHIFT (SORT_KEY_DRAW_DEPTH_SHIFT+BGFX_CONFIG_SORT_KEY_NUM_BITS_DEPTH+SORT_KEY_NUM_BITS_TRANS)
#define SORT_KEY_DRAW_DEPTH_MASK ( (uint64_t(UINT32_MAX) )<<SORT_KEY_DRAW_DEPTH_SHIFT)
#define SORT_KEY_COMPUTE_PROGRAM_SHIFT 0x22
#define SORT_KEY_COMPUTE_PROGRAM_MASK ( (uint64_t(BGFX_CONFIG_MAX_PROGRAMS-1) )<<SORT_KEY_COMPUTE_PROGRAM_SHIFT) #define SORT_KEY_COMPUTE_PROGRAM_MASK ( (uint64_t(BGFX_CONFIG_MAX_PROGRAMS-1) )<<SORT_KEY_COMPUTE_PROGRAM_SHIFT)
#define SORT_KEY_DRAW_TRANS_SHIFT (SORT_KEY_DRAW_PROGRAM_SHIFT+BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM)
#define SORT_KEY_DRAW_TRANS_MASK (UINT64_C(0x3)<<SORT_KEY_DRAW_TRANS_SHIFT)
#define SORT_KEY_SEQ_SHIFT (SORT_KEY_DRAW_TRANS_SHIFT+SORT_KEY_NUM_BITS_TRANS)
#define SORT_KEY_SEQ_MASK ( ( (UINT64_C(1)<<BGFX_CONFIG_SORT_KEY_NUM_BITS_SEQ)-1)<<SORT_KEY_SEQ_SHIFT)
BX_STATIC_ASSERT(BGFX_CONFIG_MAX_VIEWS <= 256); BX_STATIC_ASSERT(BGFX_CONFIG_MAX_VIEWS <= 256);
BX_STATIC_ASSERT( (BGFX_CONFIG_MAX_PROGRAMS & (BGFX_CONFIG_MAX_PROGRAMS-1) ) == 0); // Must be power of 2. BX_STATIC_ASSERT( (BGFX_CONFIG_MAX_PROGRAMS & (BGFX_CONFIG_MAX_PROGRAMS-1) ) == 0); // Must be power of 2.
BX_STATIC_ASSERT( (0 // Render key mask shouldn't overlap. BX_STATIC_ASSERT( (0 // Render key mask shouldn't overlap.
@ -802,7 +804,7 @@ namespace bgfx
/// Returns true if item is command. /// Returns true if item is command.
bool decode(uint64_t _key) bool decode(uint64_t _key)
{ {
m_seq = uint16_t( (_key & SORT_KEY_SEQ_MASK ) >> SORT_KEY_SEQ_SHIFT); m_seq = uint32_t( (_key & SORT_KEY_SEQ_MASK ) >> SORT_KEY_SEQ_SHIFT);
m_view = uint8_t( (_key & SORT_KEY_VIEW_MASK) >> SORT_KEY_VIEW_SHIFT); m_view = uint8_t( (_key & SORT_KEY_VIEW_MASK) >> SORT_KEY_VIEW_SHIFT);
if (_key & SORT_KEY_DRAW_BIT) if (_key & SORT_KEY_DRAW_BIT)
{ {
@ -834,15 +836,15 @@ namespace bgfx
void reset() void reset()
{ {
m_depth = 0; m_depth = 0;
m_program = 0;
m_seq = 0; m_seq = 0;
m_program = 0;
m_view = 0; m_view = 0;
m_trans = 0; m_trans = 0;
} }
uint32_t m_depth; uint32_t m_depth;
uint32_t m_seq;
uint16_t m_program; uint16_t m_program;
uint16_t m_seq;
uint8_t m_view; uint8_t m_view;
uint8_t m_trans; uint8_t m_trans;
}; };

20
src/config.h
View file

@ -197,6 +197,21 @@
# define BGFX_CONFIG_MAX_RECT_CACHE (4<<10) # define BGFX_CONFIG_MAX_RECT_CACHE (4<<10)
#endif // BGFX_CONFIG_MAX_RECT_CACHE #endif // BGFX_CONFIG_MAX_RECT_CACHE
#ifndef BGFX_CONFIG_SORT_KEY_NUM_BITS_DEPTH
# define BGFX_CONFIG_SORT_KEY_NUM_BITS_DEPTH 32
#endif // BGFX_CONFIG_SORT_KEY_NUM_BITS_DEPTH
#ifndef BGFX_CONFIG_SORT_KEY_NUM_BITS_SEQ
# define BGFX_CONFIG_SORT_KEY_NUM_BITS_SEQ 11
#endif // BGFX_CONFIG_SORT_KEY_NUM_BITS_SEQ
#ifndef BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM
# define BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM 9
#endif // BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM
// Cannot be configured directly. Must must be power of 2.
#define BGFX_CONFIG_MAX_PROGRAMS (1<<BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM)
#ifndef BGFX_CONFIG_MAX_VIEWS #ifndef BGFX_CONFIG_MAX_VIEWS
// Do not change. Must be power of 2. // Do not change. Must be power of 2.
# define BGFX_CONFIG_MAX_VIEWS 256 # define BGFX_CONFIG_MAX_VIEWS 256
@ -240,11 +255,6 @@
# define BGFX_CONFIG_MAX_SHADERS 512 # define BGFX_CONFIG_MAX_SHADERS 512
#endif // BGFX_CONFIG_MAX_FRAGMENT_SHADERS #endif // BGFX_CONFIG_MAX_FRAGMENT_SHADERS
#ifndef BGFX_CONFIG_MAX_PROGRAMS
// Must be power of 2.
# define BGFX_CONFIG_MAX_PROGRAMS 512
#endif // BGFX_CONFIG_MAX_PROGRAMS
#ifndef BGFX_CONFIG_MAX_TEXTURES #ifndef BGFX_CONFIG_MAX_TEXTURES
# define BGFX_CONFIG_MAX_TEXTURES (4<<10) # define BGFX_CONFIG_MAX_TEXTURES (4<<10)
#endif // BGFX_CONFIG_MAX_TEXTURES #endif // BGFX_CONFIG_MAX_TEXTURES