swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-12 06:08:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (Diligent/PSO,Program): get rid of phantom program 0

Browse Source
This commit is contained in:
swung0x48
2025-06-22 21:59:20 +08:00
parent a8ae34b3bd
commit 6e9f990eed
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MG/MG_GL/Implementations/EGL/Diligent/EGL_impl.cpp
+8
View File
@@ -291,6 +291,8 @@ namespace MG_Diligent {
} }
void PipelineStateManager::ReleasePSO(GLuint program) { void PipelineStateManager::ReleasePSO(GLuint program) {
if (program == 0)
return;
auto &programInfo = g_ProgramMap[program]; auto &programInfo = g_ProgramMap[program];
if (programInfo.pPipelineState) { if (programInfo.pPipelineState) {
MG_Util::Debug::LogD("Releasing PSO for program %u", program); MG_Util::Debug::LogD("Releasing PSO for program %u", program);
@@ -302,6 +304,8 @@ namespace MG_Diligent {
} }
void PipelineStateManager::MarkPSODirty(GLuint program) { void PipelineStateManager::MarkPSODirty(GLuint program) {
if (program == 0)
return;
auto &programInfo = g_ProgramMap[program]; auto &programInfo = g_ProgramMap[program];
programInfo.psoDirty = true; programInfo.psoDirty = true;
MG_Util::Debug::LogD("Marked PSO dirty for program %u", program); MG_Util::Debug::LogD("Marked PSO dirty for program %u", program);
@@ -345,6 +349,9 @@ namespace MG_Diligent {
assert(ConvertGLBlendFactor(commonState.blendDstRGB) == desc.BlendDesc.RenderTargets[0].DestBlend); assert(ConvertGLBlendFactor(commonState.blendDstRGB) == desc.BlendDesc.RenderTargets[0].DestBlend);
assert(ConvertGLBlendFactor(commonState.blendSrcAlpha) == desc.BlendDesc.RenderTargets[0].SrcBlendAlpha); assert(ConvertGLBlendFactor(commonState.blendSrcAlpha) == desc.BlendDesc.RenderTargets[0].SrcBlendAlpha);
assert(ConvertGLBlendFactor(commonState.blendDstAlpha) == desc.BlendDesc.RenderTargets[0].DestBlendAlpha); assert(ConvertGLBlendFactor(commonState.blendDstAlpha) == desc.BlendDesc.RenderTargets[0].DestBlendAlpha);
assert(ConvertGLDepthFunc(commonState.depthFunc) == desc.DepthStencilDesc.DepthFunc);
assert(commonState.capabilities[GL_DEPTH_TEST] == desc.DepthStencilDesc.DepthEnable);
// if ((ConvertGLBlendFactor(commonState.blendSrcRGB) == desc.BlendDesc.RenderTargets[0].SrcBlend) && // if ((ConvertGLBlendFactor(commonState.blendSrcRGB) == desc.BlendDesc.RenderTargets[0].SrcBlend) &&
// (ConvertGLBlendFactor(commonState.blendDstRGB) == desc.BlendDesc.RenderTargets[0].DestBlend) && // (ConvertGLBlendFactor(commonState.blendDstRGB) == desc.BlendDesc.RenderTargets[0].DestBlend) &&
// (ConvertGLBlendFactor(commonState.blendSrcAlpha) == desc.BlendDesc.RenderTargets[0].SrcBlendAlpha) && // (ConvertGLBlendFactor(commonState.blendSrcAlpha) == desc.BlendDesc.RenderTargets[0].SrcBlendAlpha) &&
@@ -409,6 +416,7 @@ namespace MG_Diligent {
MG_Util::Debug::LogD(" GraphicsPipeline.DSVFormat: %d", PSOCreateInfo.GraphicsPipeline.DSVFormat); MG_Util::Debug::LogD(" GraphicsPipeline.DSVFormat: %d", PSOCreateInfo.GraphicsPipeline.DSVFormat);
MG_Util::Debug::LogD(" GraphicsPipeline.BlendDesc.IndependentBlendEnable: %s", PSOCreateInfo.GraphicsPipeline.BlendDesc.IndependentBlendEnable ? "true" : "false"); MG_Util::Debug::LogD(" GraphicsPipeline.BlendDesc.IndependentBlendEnable: %s", PSOCreateInfo.GraphicsPipeline.BlendDesc.IndependentBlendEnable ? "true" : "false");
MG_Util::Debug::LogD(" GraphicsPipeline.DepthStencilDesc.DepthEnable: %s", PSOCreateInfo.GraphicsPipeline.DepthStencilDesc.DepthEnable ? "true" : "false"); MG_Util::Debug::LogD(" GraphicsPipeline.DepthStencilDesc.DepthEnable: %s", PSOCreateInfo.GraphicsPipeline.DepthStencilDesc.DepthEnable ? "true" : "false");
MG_Util::Debug::LogD(" GraphicsPipeline.DepthStencilDesc.DepthFunc: 0x%x", PSOCreateInfo.GraphicsPipeline.DepthStencilDesc.DepthFunc);
MG_Util::Debug::LogD(" GraphicsPipeline.RasterizerDesc.CullMode: %d", PSOCreateInfo.GraphicsPipeline.RasterizerDesc.CullMode); MG_Util::Debug::LogD(" GraphicsPipeline.RasterizerDesc.CullMode: %d", PSOCreateInfo.GraphicsPipeline.RasterizerDesc.CullMode);
MG_Util::Debug::LogD("Blend states: "); MG_Util::Debug::LogD("Blend states: ");
MG/MG_GL/Implementations/GL/Program/GL_Program.cpp
+2 -1
View File
@@ -285,6 +285,8 @@ namespace MG_GL::GL {
auto& programInfo = MG_Diligent::g_ProgramMap[program]; auto& programInfo = MG_Diligent::g_ProgramMap[program];
auto& programObj = MG_State_T::programState->programs_[program]; auto& programObj = MG_State_T::programState->programs_[program];
programInfo.id = program;
for (const auto& shaderId : programObj.attachedShaders) { for (const auto& shaderId : programObj.attachedShaders) {
programInfo.AttachedShadersID.push_back(shaderId); programInfo.AttachedShadersID.push_back(shaderId);
} }
@@ -372,7 +374,6 @@ namespace MG_GL::GL {
} }
} }
programInfo.id = program;
programInfo.inputLayout.clear(); programInfo.inputLayout.clear();
auto* pVAO = MG_State_T::vertexArrayState->GetCurrentVAO(); auto* pVAO = MG_State_T::vertexArrayState->GetCurrentVAO();