swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-11 21:58:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (Diligent/PSO): Build InputLayout for PSO.

Browse Source
This commit is contained in:
BZLZHH
2025-06-08 17:29:10 +08:00
parent f3497bd2fa
commit 4dfbc01479
3 changed files with 131 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MG/MG_GL/Implementations/EGL/Diligent/EGL_impl.cpp
+72 -1
View File
@@ -26,6 +26,61 @@ namespace MG_Diligent {
bool IsInRenderPass = false; bool IsInRenderPass = false;
bool initialized = false; bool initialized = false;
void BuildInputLayout(GLuint program, VertexArrayState& vaState,
std::vector<Diligent::LayoutElement>& inputLayout) {
inputLayout.clear();
auto& programObj = MG_State_T::programState->programs_[program];
for (const auto& [attribIndex, attrib] : vaState.vaos_[vaState.currentVao_].attribs) {
if (!attrib.enabled) continue;
std::string attribName;
for (auto [name, loc] : programObj.attribLocations) {
if (loc == attribIndex) {
attribName = name;
break;
}
}
MG_State::QueryProgramAttributeLocation(program, attribName.c_str());
if (attribIndex == -1) {
continue;
}
Diligent::LayoutElement element;
element.InputIndex = static_cast<Diligent::Uint32>(attribIndex);
element.BufferSlot = 0;
element.NumComponents = attrib.size;
switch (attrib.type) {
case GL_BYTE: element.ValueType = Diligent::VT_INT8; break;
case GL_UNSIGNED_BYTE: element.ValueType = Diligent::VT_UINT8; break;
case GL_SHORT: element.ValueType = Diligent::VT_INT16; break;
case GL_UNSIGNED_SHORT: element.ValueType = Diligent::VT_UINT16; break;
case GL_INT: element.ValueType = Diligent::VT_INT32; break;
case GL_UNSIGNED_INT: element.ValueType = Diligent::VT_UINT32; break;
case GL_FLOAT: element.ValueType = Diligent::VT_FLOAT32; break;
case GL_HALF_FLOAT: element.ValueType = Diligent::VT_FLOAT16; break;
case GL_DOUBLE: element.ValueType = Diligent::VT_FLOAT64; break;
default: element.ValueType = Diligent::VT_UNDEFINED; break;
}
element.IsNormalized = attrib.normalized;
element.RelativeOffset = static_cast<Diligent::Uint32>(reinterpret_cast<size_t>(attrib.pointer));
inputLayout.push_back(element);
MG_Util::Debug::LogD("Built LayoutElement for attrib '%s' (location %d): "
"NumComponents=%d, ValueType=%d, IsNormalized=%s, RelativeOffset=%u",
attribName.c_str(), attribIndex,
element.NumComponents, element.ValueType,
element.IsNormalized ? "true" : "false",
element.RelativeOffset);
}
}
void PipelineStateManager::ConfigurePSO( void PipelineStateManager::ConfigurePSO(
Diligent::GraphicsPipelineStateCreateInfo &PSOCreateInfo, Diligent::GraphicsPipelineStateCreateInfo &PSOCreateInfo,
GLProgramInfo &programInfo, GLProgramInfo &programInfo,
@@ -101,6 +156,20 @@ namespace MG_Diligent {
Diligent::CULL_MODE_BACK : Diligent::CULL_MODE_NONE; Diligent::CULL_MODE_BACK : Diligent::CULL_MODE_NONE;
rasterizerDesc.FrontCounterClockwise = true; rasterizerDesc.FrontCounterClockwise = true;
if (!programInfo.inputLayout.empty()) {
PSOCreateInfo.GraphicsPipeline.InputLayout.LayoutElements = programInfo.inputLayout.data();
PSOCreateInfo.GraphicsPipeline.InputLayout.NumElements =
static_cast<Diligent::Uint32>(programInfo.inputLayout.size());
MG_Util::Debug::LogD("Configured InputLayout with %zu elements",
programInfo.inputLayout.size());
} else {
MG_Util::Debug::LogW("No input layout elements for PSO");
PSOCreateInfo.GraphicsPipeline.InputLayout.LayoutElements = nullptr;
PSOCreateInfo.GraphicsPipeline.InputLayout.NumElements = 0;
}
ConfigureResourceLayout(PSOCreateInfo, programInfo); ConfigureResourceLayout(PSOCreateInfo, programInfo);
} }
@@ -141,7 +210,9 @@ namespace MG_Diligent {
if (it != psoCache.end()) { if (it != psoCache.end()) {
return it->second; return it->second;
} }
MG_Diligent::BuildInputLayout(program, vaState, programInfo.inputLayout);
Diligent::GraphicsPipelineStateCreateInfo PSOCreateInfo; Diligent::GraphicsPipelineStateCreateInfo PSOCreateInfo;
ConfigurePSO(PSOCreateInfo, programInfo, commonState, vaState, fbInfo); ConfigurePSO(PSOCreateInfo, programInfo, commonState, vaState, fbInfo);
MG/MG_GL/Implementations/EGL/Diligent/EGL_impl.h
+4 -1
View File
@@ -243,7 +243,10 @@ namespace MG_Diligent {
}; };
extern PipelineStateManager g_PSOManager; extern PipelineStateManager g_PSOManager;
void BuildInputLayout(GLuint program, VertexArrayState& vaState,
std::vector<Diligent::LayoutElement>& inputLayout);
extern bool initialized; extern bool initialized;
extern bool IsInRenderPass; extern bool IsInRenderPass;
} }
MG/MG_GL/Implementations/GL/Drawing/GL_Drawing.cpp
+55 -42
View File
@@ -8,7 +8,7 @@ namespace MG_GL::GL {
void CreateRenderPassAndFramebuffer(GLuint framebuffer, void CreateRenderPassAndFramebuffer(GLuint framebuffer,
const FramebufferObject& fbo, const FramebufferObject& fbo,
MG_Diligent::GLFramebufferInfo& fbInfo); MG_Diligent::GLFramebufferInfo& fbInfo);
inline bool IsSamplerType(GLenum type) { inline bool IsSamplerType(GLenum type) {
switch (type) { switch (type) {
case GL_SAMPLER_2D: case GL_SAMPLER_2D:
@@ -43,14 +43,14 @@ namespace MG_GL::GL {
case GL_UNSIGNED_INT_VEC2: return 2 * sizeof(uint32_t); case GL_UNSIGNED_INT_VEC2: return 2 * sizeof(uint32_t);
case GL_UNSIGNED_INT_VEC3: return 3 * sizeof(uint32_t); case GL_UNSIGNED_INT_VEC3: return 3 * sizeof(uint32_t);
case GL_UNSIGNED_INT_VEC4: return 4 * sizeof(uint32_t); case GL_UNSIGNED_INT_VEC4: return 4 * sizeof(uint32_t);
// case GL_DOUBLE: return sizeof(double); // Not supported // case GL_DOUBLE: return sizeof(double); // Not supported
// case GL_DOUBLE_VEC2: return 2 * sizeof(double); // Not supported // case GL_DOUBLE_VEC2: return 2 * sizeof(double); // Not supported
// case GL_DOUBLE_VEC3: return 3 * sizeof(double); // Not supported // case GL_DOUBLE_VEC3: return 3 * sizeof(double); // Not supported
// case GL_DOUBLE_VEC4: return 4 * sizeof(double); // Not supported // case GL_DOUBLE_VEC4: return 4 * sizeof(double); // Not supported
default: return 0; default: return 0;
} }
} }
inline size_t AlignSize(size_t size, size_t alignment) { inline size_t AlignSize(size_t size, size_t alignment) {
return (size + alignment - 1) & ~(alignment - 1); return (size + alignment - 1) & ~(alignment - 1);
} }
@@ -73,7 +73,7 @@ namespace MG_GL::GL {
return Diligent::SHADER_TYPE_UNKNOWN; return Diligent::SHADER_TYPE_UNKNOWN;
} }
} }
Diligent::SHADER_TYPE GetShaderStageForUniform(GLuint program, const std::string& name) { Diligent::SHADER_TYPE GetShaderStageForUniform(GLuint program, const std::string& name) {
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];
@@ -176,11 +176,11 @@ namespace MG_GL::GL {
return stage; return stage;
} }
void UpdateSamplerAndTextureUniforms(GLuint program, Diligent::IShaderResourceBinding& pSRB) { void UpdateSamplerAndTextureUniforms(GLuint program, Diligent::IShaderResourceBinding& pSRB) {
MG_Util::Debug::LogD("Updating sampler and texture uniforms for program %u", program); MG_Util::Debug::LogD("Updating sampler and texture uniforms for program %u", program);
auto& programObj = MG_State_T::programState->programs_[program]; auto& programObj = MG_State_T::programState->programs_[program];
for (auto& [name, uniform] : programObj.uniformValues) { for (auto& [name, uniform] : programObj.uniformValues) {
if (!IsSamplerType(uniform.type)) continue; if (!IsSamplerType(uniform.type)) continue;
@@ -191,7 +191,7 @@ namespace MG_GL::GL {
textureID = unitState->GetBoundTexture(unitState->activeTarget); textureID = unitState->GetBoundTexture(unitState->activeTarget);
MG_Util::Debug::LogD("Sampler '%s' (type: %X) uses texture ID: %u", name.c_str(), uniform.type, textureID); MG_Util::Debug::LogD("Sampler '%s' (type: %X) uses texture ID: %u", name.c_str(), uniform.type, textureID);
} }
Diligent::ITextureView* pTextureView = nullptr; Diligent::ITextureView* pTextureView = nullptr;
if (textureID != 0) { if (textureID != 0) {
auto it = MG_Diligent::g_TextureViewMap.find(textureID); auto it = MG_Diligent::g_TextureViewMap.find(textureID);
@@ -226,7 +226,7 @@ namespace MG_GL::GL {
void * mapped; void * mapped;
MG_Util::Debug::LogD("Mapping UBO for program %u", program); MG_Util::Debug::LogD("Mapping UBO for program %u", program);
MG_Diligent::g_pContext->MapBuffer(programInfo.pDefaultUBO, Diligent::MAP_WRITE, MG_Diligent::g_pContext->MapBuffer(programInfo.pDefaultUBO, Diligent::MAP_WRITE,
Diligent::MAP_FLAG_DISCARD, mapped); Diligent::MAP_FLAG_DISCARD, mapped);
if (mapped) { if (mapped) {
MG_Util::Debug::LogD("UBO mapped successfully for program %u. Updating uniform values.", program); MG_Util::Debug::LogD("UBO mapped successfully for program %u. Updating uniform values.", program);
@@ -287,30 +287,30 @@ namespace MG_GL::GL {
case GL_UNSIGNED_INT_VEC4: case GL_UNSIGNED_INT_VEC4:
memcpy(uboData + offset, uniform.uintData.data(), 4 * sizeof(uint32_t)); memcpy(uboData + offset, uniform.uintData.data(), 4 * sizeof(uint32_t));
break; break;
// Not supported types // Not supported types
// case GL_DOUBLE: // case GL_DOUBLE:
// *reinterpret_cast<double*>(uboData + offset) = uniform.doubleData[0]; // *reinterpret_cast<double*>(uboData + offset) = uniform.doubleData[0];
// break; // break;
// case GL_DOUBLE_VEC2: // case GL_DOUBLE_VEC2:
// memcpy(uboData + offset, uniform.doubleData.data(), 2 * sizeof(double)); // memcpy(uboData + offset, uniform.doubleData.data(), 2 * sizeof(double));
// break; // break;
// case GL_DOUBLE_VEC3: // case GL_DOUBLE_VEC3:
// memcpy(uboData + offset, uniform.doubleData.data(), 3 * sizeof(double)); // memcpy(uboData + offset, uniform.doubleData.data(), 3 * sizeof(double));
// break; // break;
// case GL_DOUBLE_VEC4: // case GL_DOUBLE_VEC4:
// memcpy(uboData + offset, uniform.doubleData.data(), 4 * sizeof(double)); // memcpy(uboData + offset, uniform.doubleData.data(), 4 * sizeof(double));
// break; // break;
// case GL_DOUBLE_MAT2: // case GL_DOUBLE_MAT2:
// memcpy(uboData + offset, uniform.doubleData.data(), 4 * sizeof(double)); // memcpy(uboData + offset, uniform.doubleData.data(), 4 * sizeof(double));
// break; // break;
// case GL_DOUBLE_MAT3: // case GL_DOUBLE_MAT3:
// memcpy(uboData + offset, uniform.doubleData.data(), 9 * sizeof(double)); // memcpy(uboData + offset, uniform.doubleData.data(), 9 * sizeof(double));
// break; // break;
// case GL_DOUBLE_MAT4: // case GL_DOUBLE_MAT4:
// memcpy(uboData + offset, uniform.doubleData.data(), 16 * sizeof(double)); // memcpy(uboData + offset, uniform.doubleData.data(), 16 * sizeof(double));
// break; // break;
// ... // ...
} }
} }
} }
@@ -396,7 +396,7 @@ namespace MG_GL::GL {
} }
auto& programInfo = MG_Diligent::g_ProgramMap[program]; auto& programInfo = MG_Diligent::g_ProgramMap[program];
GLuint drawFB = MG_State_T::framebufferState->currentBindings_[GL_DRAW_FRAMEBUFFER]; GLuint drawFB = MG_State_T::framebufferState->currentBindings_[GL_DRAW_FRAMEBUFFER];
if (drawFB == 0) drawFB = 0; if (drawFB == 0) drawFB = 0;
@@ -406,7 +406,7 @@ namespace MG_GL::GL {
return; return;
} }
MG_Diligent::GLFramebufferInfo& fbInfo = itFB->second; MG_Diligent::GLFramebufferInfo& fbInfo = itFB->second;
MG_Util::Debug::LogD("Fetching PSO for program %u", program); MG_Util::Debug::LogD("Fetching PSO for program %u", program);
programInfo.pPipelineState = MG_Diligent::g_PSOManager.GetOrCreatePSO( programInfo.pPipelineState = MG_Diligent::g_PSOManager.GetOrCreatePSO(
program, program,
@@ -430,12 +430,12 @@ namespace MG_GL::GL {
MG_Util::Debug::LogE("Failed to create ShaderResourceBinding for program %u", program); MG_Util::Debug::LogE("Failed to create ShaderResourceBinding for program %u", program);
return; return;
} }
MG_Util::Debug::LogD("Successfully created ShaderResourceBinding for program %u", program); MG_Util::Debug::LogD("Successfully created ShaderResourceBinding for program %u", program);
} }
MG_Diligent::g_pContext->SetPipelineState(programInfo.pPipelineState); MG_Diligent::g_pContext->SetPipelineState(programInfo.pPipelineState);
auto* pVAO = MG_State_T::vertexArrayState->GetCurrentVAO(); auto* pVAO = MG_State_T::vertexArrayState->GetCurrentVAO();
if (!pVAO) { if (!pVAO) {
MG_Util::Debug::LogE("No current VAO found. A VAO must be bound before drawing."); MG_Util::Debug::LogE("No current VAO found. A VAO must be bound before drawing.");
@@ -455,14 +455,12 @@ namespace MG_GL::GL {
if (!pBuffer) { if (!pBuffer) {
Diligent::BufferDesc BuffDesc; Diligent::BufferDesc BuffDesc;
BuffDesc.Name = "Buffer"; std::string bufferName = "Dynamic VBO " + std::to_string(buffer);
BuffDesc.Name = bufferName.c_str();
BuffDesc.Size = bufferObj.data.size(); BuffDesc.Size = bufferObj.data.size();
BuffDesc.Usage = Diligent::USAGE_DYNAMIC; BuffDesc.Usage = Diligent::USAGE_DYNAMIC;
BuffDesc.BindFlags = Diligent::BIND_VERTEX_BUFFER; BuffDesc.BindFlags = Diligent::BIND_VERTEX_BUFFER;
BuffDesc.CPUAccessFlags = Diligent::CPU_ACCESS_WRITE;
if (bufferObj.isDynamic) {
BuffDesc.CPUAccessFlags = Diligent::CPU_ACCESS_WRITE;
}
if (pBuffer) { if (pBuffer) {
pBuffer->Release(); pBuffer->Release();
@@ -470,13 +468,13 @@ namespace MG_GL::GL {
MG_Diligent::g_pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer); MG_Diligent::g_pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer);
} }
if (pBuffer && !bufferObj.data.empty()) { if (pBuffer && !bufferObj.data.empty()) {
void* pMappedData = nullptr; void* pMappedData = nullptr;
MG_Diligent::g_pContext->MapBuffer( MG_Diligent::g_pContext->MapBuffer(
pBuffer, pBuffer,
Diligent::MAP_WRITE, Diligent::MAP_WRITE,
bufferObj.isDynamic ? Diligent::MAP_FLAG_DISCARD : Diligent::MAP_FLAG_NONE, Diligent::MAP_FLAG_DISCARD,
pMappedData pMappedData
); );
@@ -499,15 +497,13 @@ namespace MG_GL::GL {
if (!pBuffer) { if (!pBuffer) {
Diligent::BufferDesc BuffDesc; Diligent::BufferDesc BuffDesc;
BuffDesc.Name = "IndexBuffer"; std::string bufferName = "Dynamic IBO " + std::to_string(buffer);
BuffDesc.Name = bufferName.c_str();
BuffDesc.Size = bufferObj.data.size(); BuffDesc.Size = bufferObj.data.size();
BuffDesc.Usage = bufferObj.isDynamic ? Diligent::USAGE_DYNAMIC BuffDesc.Usage = bufferObj.isDynamic ? Diligent::USAGE_DYNAMIC
: Diligent::USAGE_DEFAULT; : Diligent::USAGE_DEFAULT;
BuffDesc.BindFlags = Diligent::BIND_INDEX_BUFFER; BuffDesc.BindFlags = Diligent::BIND_INDEX_BUFFER;
BuffDesc.CPUAccessFlags = Diligent::CPU_ACCESS_WRITE;
if (bufferObj.isDynamic) {
BuffDesc.CPUAccessFlags = Diligent::CPU_ACCESS_WRITE;
}
if (pBuffer) { if (pBuffer) {
pBuffer->Release(); pBuffer->Release();
@@ -515,7 +511,7 @@ namespace MG_GL::GL {
MG_Diligent::g_pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer); MG_Diligent::g_pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer);
} }
if (pBuffer && !bufferObj.data.empty()) { if (pBuffer && !bufferObj.data.empty()) {
void* pMappedData = nullptr; void* pMappedData = nullptr;
MG_Diligent::g_pContext->MapBuffer( MG_Diligent::g_pContext->MapBuffer(
@@ -532,7 +528,7 @@ namespace MG_GL::GL {
createdBuffers[buffer] = pBuffer; createdBuffers[buffer] = pBuffer;
} }
} }
} }
} }
@@ -551,6 +547,23 @@ namespace MG_GL::GL {
} }
if (!vertexBuffers.empty()) { if (!vertexBuffers.empty()) {
MG_Util::Debug::LogD("Setting Vertex Buffers:");
MG_Util::Debug::LogD(" NumBuffers: %u", static_cast<Diligent::Uint32>(vertexBuffers.size()));
for (size_t i = 0; i < vertexBuffers.size(); ++i) {
MG_Util::Debug::LogD(" Buffer %zu:", i);
if (vertexBuffers[i]) {
const auto& desc = vertexBuffers[i]->GetDesc();
MG_Util::Debug::LogD(" Name: %s", desc.Name ? desc.Name : "N/A");
MG_Util::Debug::LogD(" Size: %llu", desc.Size);
MG_Util::Debug::LogD(" Usage: %d", desc.Usage);
MG_Util::Debug::LogD(" BindFlags: %u", desc.BindFlags);
MG_Util::Debug::LogD(" CPUAccessFlags: %u", desc.CPUAccessFlags);
} else {
MG_Util::Debug::LogD(" <null buffer>");
}
MG_Util::Debug::LogD(" Offset: %llu", offsets[i]);
}
MG_Diligent::g_pContext->SetVertexBuffers( MG_Diligent::g_pContext->SetVertexBuffers(
0, 0,
static_cast<Diligent::Uint32>(vertexBuffers.size()), static_cast<Diligent::Uint32>(vertexBuffers.size()),
@@ -565,7 +578,7 @@ namespace MG_GL::GL {
GLuint buffer = pVAO->elementBuffer; GLuint buffer = pVAO->elementBuffer;
auto it = MG_Diligent::g_BufferMap.find(buffer); auto it = MG_Diligent::g_BufferMap.find(buffer);
if (it != MG_Diligent::g_BufferMap.end() && it->second) { if (it != MG_Diligent::g_BufferMap.end() && it->second) {
Diligent::Uint64 offset = reinterpret_cast<uintptr_t>(indices); auto offset = reinterpret_cast<uintptr_t>(indices);
MG_Diligent::g_pContext->SetIndexBuffer( MG_Diligent::g_pContext->SetIndexBuffer(
it->second, it->second,
@@ -611,7 +624,7 @@ namespace MG_GL::GL {
void DrawArrays(GLenum mode, GLint first, GLsizei count) { void DrawArrays(GLenum mode, GLint first, GLsizei count) {
// TODO // TODO
} }
void DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex) { void DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex) {
// TODO // TODO
} }
@@ -619,7 +632,7 @@ namespace MG_GL::GL {
void MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid *const *indices, GLsizei drawcount) { void MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid *const *indices, GLsizei drawcount) {
// TODO // TODO
} }
void MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid *const *indices, GLsizei drawcount, const GLint *basevertex) { void MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid *const *indices, GLsizei drawcount, const GLint *basevertex) {
// TODO // TODO
} }