mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1736 from attilaz/mtl-constant-buffer-fix 

fixed uninitialized constant buffer memory
This commit is contained in:
Бранимир Караџић 2019-04-21 07:12:33 -07:00 committed by GitHub
parent 4a07ab392f e84f78b60b
commit d1ab0c175f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/renderer_mtl.mm
View File

@ -3953,7 +3953,6 @@ namespace bgfx { namespace mtl
const RenderCompute& compute = renderItem.compute;
bool programChanged = false;
bool constantsChanged = compute.m_uniformBegin < compute.m_uniformEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer[compute.m_uniformIdx], compute.m_uniformBegin, compute.m_uniformEnd);
if (key.m_program.idx != currentProgram.idx)
@ -3969,8 +3968,7 @@ namespace bgfx { namespace mtl
}
m_computeCommandEncoder.setComputePipelineState(currentPso->m_cps);
programChanged =
constantsChanged = true;
programChanged = true;
}
if (isValid(currentProgram)
@ -3984,13 +3982,10 @@ namespace bgfx { namespace mtl
m_computeCommandEncoder.setBuffer(m_uniformBuffer, m_uniformBufferVertexOffset, 0);
}
if (constantsChanged)
UniformBuffer* vcb = currentPso->m_vshConstantBuffer;
if (NULL != vcb)
{
UniformBuffer* vcb = currentPso->m_vshConstantBuffer;
if (NULL != vcb)
{
commit(*vcb);
}
commit(*vcb);
}
viewState.setPredefined<4>(this, view, *currentPso, _render, compute);
@ -4233,7 +4228,6 @@ namespace bgfx { namespace mtl
}
bool programChanged = false;
bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
rendererUpdateUniforms(this, _render->m_uniformBuffer[draw.m_uniformIdx], draw.m_uniformBegin, draw.m_uniformEnd);
bool vertexStreamChanged = hasVertexStreamChanged(currentState, draw);
@ -4333,8 +4327,7 @@ namespace bgfx { namespace mtl
rce.setVertexBuffer(inst.m_ptr, draw.m_instanceDataOffset, numStreams+1);
}
programChanged =
constantsChanged = true;
programChanged = true;
}
if (isValid(currentProgram) )
@ -4355,19 +4348,16 @@ namespace bgfx { namespace mtl
rce.setFragmentBuffer(m_uniformBuffer, m_uniformBufferFragmentOffset, 0);
}
if (constantsChanged)
UniformBuffer* vcb = currentPso->m_vshConstantBuffer;
if (NULL != vcb)
{
UniformBuffer* vcb = currentPso->m_vshConstantBuffer;
if (NULL != vcb)
{
commit(*vcb);
}
UniformBuffer* fcb = currentPso->m_fshConstantBuffer;
if (NULL != fcb)
{
commit(*fcb);
}
commit(*vcb);
}
UniformBuffer* fcb = currentPso->m_fshConstantBuffer;
if (NULL != fcb)
{
commit(*fcb);
}
viewState.setPredefined<4>(this, view, *currentPso, _render, draw);