Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-06-08 03:13:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Metal: Fix null deref in render encoder and processArguments. (#3725)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-06-02 10:20:57 -07:00
committed by GitHub
parent b0f61277f5
commit 5a1b2bbc9e
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/renderer_d3d11.cpp
View File

@@ -5596,6 +5596,7 @@ namespace bgfx { namespace d3d11
}
updateNativeWindow();
if (updateResolution(_render->m_resolution) )
{
return;

35
src/renderer_mtl.cpp
View File

@@ -2443,9 +2443,12 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
ps->m_fshConstantBufferAlignment = uint32_t(arg->bufferAlignment() );
}
NS::Array* members = arg->bufferStructType()->members();
NS::Array* members = NULL != arg->bufferStructType()
? arg->bufferStructType()->members()
: NULL
;
for (NS::UInteger mi = 0, mc = members->count(); mi < mc; ++mi)
for (NS::UInteger mi = 0, mc = NULL != members ? members->count() : 0; mi < mc; ++mi)
{
MTL::StructMember* uniform = (MTL::StructMember*)members->object(mi);
const char* name = utf8String(uniform->name() );
@@ -2988,6 +2991,33 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
return m_blitCommandEncoder;
}
MTL::RenderCommandEncoder* getRenderCommandEncoder()
{
if (NULL == m_renderCommandEncoder)
{
MTL::RenderPassDescriptor* renderPassDescriptor = newRenderPassDescriptor();
setFrameBuffer(renderPassDescriptor, m_renderCommandEncoderFrameBufferHandle);
renderPassDescriptor->colorAttachments()->object(0)->setLoadAction(MTL::LoadActionLoad);
renderPassDescriptor->colorAttachments()->object(0)->setStoreAction(
NULL != renderPassDescriptor->colorAttachments()->object(0)->resolveTexture()
? MTL::StoreActionMultisampleResolve
: MTL::StoreActionStore
);
m_renderCommandEncoder = m_commandBuffer->renderCommandEncoder(renderPassDescriptor);
MTL_RELEASE(renderPassDescriptor, 0);
if (m_depthClamp)
{
m_renderCommandEncoder->setDepthClipMode(MTL::DepthClipModeClamp);
}
}
return m_renderCommandEncoder;
}
void endEncoding()
{
if (NULL != m_renderCommandEncoder)
@@ -5702,6 +5732,7 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
perfStats.gpuMemoryMax = -INT64_MAX;
perfStats.gpuMemoryUsed = -INT64_MAX;
rce = getRenderCommandEncoder();
rce->setTriangleFillMode(MTL::TriangleFillModeFill);
if (_render->m_debug & (BGFX_DEBUG_IFH|BGFX_DEBUG_STATS) )