Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-10-09 21:08:03 -07:00
parent be158a6055
commit 2008a041ab
8 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bgfx.cpp
View File

@@ -909,9 +909,9 @@ namespace bgfx
_frame->m_sortKeys[numRenderItems] = key;
_frame->m_sortValues[numRenderItems] = numRenderItems;
m_draw.m_constBegin = _frame->m_uniformBegin;
m_draw.m_constEnd = _frame->m_uniformEnd;
m_draw.m_stateFlags |= m_stateFlags;
m_draw.m_uniformBegin = _frame->m_uniformBegin;
m_draw.m_uniformEnd = _frame->m_uniformEnd;
m_draw.m_stateFlags |= m_stateFlags;
uint32_t numVertices = UINT32_MAX;
for (uint32_t idx = 0, streamMask = m_draw.m_streamMask, ntz = bx::uint32_cnttz(streamMask)
@@ -986,8 +986,8 @@ namespace bgfx
_frame->m_sortKeys[numRenderItems] = key;
_frame->m_sortValues[numRenderItems] = numRenderItems;
m_compute.m_constBegin = _frame->m_uniformBegin;
m_compute.m_constEnd = _frame->m_uniformEnd;
m_compute.m_uniformBegin = _frame->m_uniformBegin;
m_compute.m_uniformEnd = _frame->m_uniformEnd;
_frame->m_renderItem[numRenderItems].compute = m_compute;
_frame->m_renderItemBind[numRenderItems] = m_bind;

30
src/bgfx_p.h
View File

@@ -1404,15 +1404,15 @@ namespace bgfx
{
void clear()
{
m_constBegin = 0;
m_constEnd = 0;
m_stateFlags = BGFX_STATE_DEFAULT;
m_stencil = packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT);
m_rgba = 0;
m_matrix = 0;
m_startIndex = 0;
m_numIndices = UINT32_MAX;
m_numVertices = UINT32_MAX;
m_uniformBegin = 0;
m_uniformEnd = 0;
m_stateFlags = BGFX_STATE_DEFAULT;
m_stencil = packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT);
m_rgba = 0;
m_matrix = 0;
m_startIndex = 0;
m_numIndices = UINT32_MAX;
m_numVertices = UINT32_MAX;
m_instanceDataOffset = 0;
m_instanceDataStride = 0;
m_numInstances = 1;
@@ -1442,8 +1442,8 @@ namespace bgfx
uint64_t m_stateFlags;
uint64_t m_stencil;
uint32_t m_rgba;
uint32_t m_constBegin;
uint32_t m_constEnd;
uint32_t m_uniformBegin;
uint32_t m_uniformEnd;
uint32_t m_matrix;
uint32_t m_startIndex;
uint32_t m_numIndices;
@@ -1468,8 +1468,8 @@ namespace bgfx
{
void clear()
{
m_constBegin = 0;
m_constEnd = 0;
m_uniformBegin = 0;
m_uniformEnd = 0;
m_matrix = 0;
m_numX = 0;
m_numY = 0;
@@ -1482,8 +1482,8 @@ namespace bgfx
m_numIndirect = UINT16_MAX;
}
uint32_t m_constBegin;
uint32_t m_constEnd;
uint32_t m_uniformBegin;
uint32_t m_uniformEnd;
uint32_t m_matrix;
IndirectBufferHandle m_indirectBuffer;

8
src/renderer_d3d11.cpp
View File

@@ -5806,8 +5806,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
}
bool programChanged = false;
bool constantsChanged = compute.m_constBegin < compute.m_constEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_constBegin, compute.m_constEnd);
bool constantsChanged = compute.m_uniformBegin < compute.m_uniformEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_uniformBegin, compute.m_uniformEnd);
if (key.m_program != programIdx)
{
@@ -6075,8 +6075,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
}
bool programChanged = false;
bool constantsChanged = draw.m_constBegin < draw.m_constEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
if (key.m_program != programIdx)
{

8
src/renderer_d3d12.cpp
View File

@@ -5315,10 +5315,10 @@ data.NumQualityLevels = 0;
}
bool constantsChanged = false;
if (compute.m_constBegin < compute.m_constEnd
if (compute.m_uniformBegin < compute.m_uniformEnd
|| currentProgramIdx != key.m_program)
{
rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_constBegin, compute.m_constEnd);
rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_uniformBegin, compute.m_uniformEnd);
currentProgramIdx = key.m_program;
ProgramD3D12& program = m_program[currentProgramIdx];
@@ -5432,7 +5432,7 @@ data.NumQualityLevels = 0;
primIndex = uint8_t(pt>>BGFX_STATE_PT_SHIFT);
}
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
if (isValid(draw.m_stream[0].m_handle) )
{
@@ -5634,7 +5634,7 @@ data.NumQualityLevels = 0;
}
bool constantsChanged = false;
if (draw.m_constBegin < draw.m_constEnd
if (draw.m_uniformBegin < draw.m_uniformEnd
|| currentProgramIdx != key.m_program
|| BGFX_STATE_ALPHA_REF_MASK & changedFlags)
{

4
src/renderer_d3d9.cpp
View File

@@ -4082,8 +4082,8 @@ namespace bgfx { namespace d3d9
}
bool programChanged = false;
bool constantsChanged = draw.m_constBegin < draw.m_constEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
if (key.m_program != programIdx)
{

8
src/renderer_gl.cpp
View File

@@ -6826,8 +6826,8 @@ namespace bgfx { namespace gl
if (0 != barrier)
{
bool constantsChanged = compute.m_constBegin < compute.m_constEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_constBegin, compute.m_constEnd);
bool constantsChanged = compute.m_uniformBegin < compute.m_uniformEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_uniformBegin, compute.m_uniformEnd);
if (constantsChanged
&& NULL != program.m_constantBuffer)
@@ -7240,9 +7240,9 @@ namespace bgfx { namespace gl
}
bool programChanged = false;
bool constantsChanged = draw.m_constBegin < draw.m_constEnd;
bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
bool bindAttribs = false;
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
if (key.m_program != programIdx)
{

4
src/renderer_mtl.mm
View File

@@ -3639,8 +3639,8 @@ namespace bgfx { namespace mtl
}
bool programChanged = false;
bool constantsChanged = draw.m_constBegin < draw.m_constEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
if (key.m_program != programIdx
|| (BGFX_STATE_BLEND_MASK|BGFX_STATE_BLEND_EQUATION_MASK|BGFX_STATE_ALPHA_WRITE|BGFX_STATE_RGB_WRITE|BGFX_STATE_BLEND_INDEPENDENT|BGFX_STATE_MSAA|BGFX_STATE_BLEND_ALPHA_TO_COVERAGE) & changedFlags

8
src/renderer_vk.cpp
View File

@@ -3958,10 +3958,10 @@ BX_UNUSED(currentSamplerStateIdx);
// }
bool constantsChanged = false;
if (compute.m_constBegin < compute.m_constEnd
if (compute.m_uniformBegin < compute.m_uniformEnd
|| currentProgramIdx != key.m_program)
{
rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_constBegin, compute.m_constEnd);
rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_uniformBegin, compute.m_uniformEnd);
currentProgramIdx = key.m_program;
ProgramVK& program = m_program[currentProgramIdx];
@@ -4073,7 +4073,7 @@ BX_UNUSED(currentSamplerStateIdx);
primIndex = uint8_t(pt>>BGFX_STATE_PT_SHIFT);
}
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
if (isValid(draw.m_stream[0].m_handle) )
{
@@ -4244,7 +4244,7 @@ BX_UNUSED(currentSamplerStateIdx);
}
bool constantsChanged = false;
if (draw.m_constBegin < draw.m_constEnd
if (draw.m_uniformBegin < draw.m_uniformEnd
|| currentProgramIdx != key.m_program
|| BGFX_STATE_ALPHA_REF_MASK & changedFlags)
{