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

[Feat]: (MG_Util/ShaderTranspiler): TMglGlslIoResolver: a custom glslang IoResolver to realize glBindAttribLocation semantics

Browse Source
This commit is contained in:
swung0x48
2025-11-11 17:06:46 +08:00
parent 3e9b53cecc
commit 6ac0fd6f0a
6 changed files with 114 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_Util/ShaderTranspiler/ShaderCompiler.cpp
+6 -6
View File
@@ -174,13 +174,13 @@ namespace MobileGL {
return std::unexpected(r);
}
UniquePtr<glslang::TIoMapResolver> resolver;
// UniquePtr<glslang::TIoMapResolver> resolver;
UniquePtr<TMglGlslIoResolver> resolver;
for (unsigned stage = 0; stage < EShLangCount; stage++) {
auto* pResolver = program->getGlslIoResolver((EShLanguage)stage);
if (pResolver) {
resolver = UniquePtr<glslang::TIoMapResolver>(pResolver);
break;
}
if (program->getIntermediate((EShLanguage)stage) == nullptr)
continue;
resolver = MakeUnique<TMglGlslIoResolver>(*program, (EShLanguage)stage, attrib.explicitAttribLocations);
break;
}
auto ioMapper = UniquePtr<glslang::TIoMapper>(glslang::GetGlslIoMapper());
MobileGL/MG_Util/ShaderTranspiler/Types.h
+1
View File
@@ -21,6 +21,7 @@ namespace MobileGL {
struct ProgramAttrib {
Vector<SharedPtr<glslang::TShader>> shaders;
UnorderedMap<String, Uint> explicitAttribLocations;
};
struct ProgramBinaryAttrib {
MobileGL/MG_Util/ShaderTranspiler/glslang/TMglGlslIoResolver.cpp
+14 -7
View File
@@ -4,10 +4,17 @@
#include "TMglGlslIoResolver.h"
int TMglGlslIoResolver::resolveInOutLocation(EShLanguage stage, glslang::TVarEntryInfo &ent) {
return glslang::TDefaultGlslIoResolver::resolveInOutLocation(stage, ent);
}
int TMglGlslIoResolver::resolveUniformLocation(EShLanguage stage, glslang::TVarEntryInfo &ent) {
return glslang::TDefaultGlslIoResolver::resolveUniformLocation(stage, ent);
}
namespace MobileGL {
void TMglGlslIoResolver::reserverStorageSlot(glslang::TVarEntryInfo& ent, TInfoSink& infoSink) {
const glslang::TType& type = ent.symbol->getType();
const glslang::TString& name = ent.symbol->getAccessName();
if (type.getQualifier().isPipeInput()) {
auto it = m_explicitAttribLocations.find(name.c_str());
if (it != m_explicitAttribLocations.end()) {
auto& writableType = ent.symbol->getWritableType();
writableType.getQualifier().layoutLocation = it->second;
}
}
TDefaultGlslIoResolver::reserverStorageSlot(ent, infoSink);
}
}
MobileGL/MG_Util/ShaderTranspiler/glslang/TMglGlslIoResolver.h
+15 -4
View File
@@ -11,10 +11,21 @@
#include <glslang/Include/intermediate.h>
#include <glslang/MachineIndependent/iomapper.h>
#include "TVarEntryInfo.h"
#include "MG_Util/Types.h"
class TMglGlslIoResolver: public glslang::TDefaultGlslIoResolver {
int resolveInOutLocation(EShLanguage stage, glslang::TVarEntryInfo& ent) override;
int resolveUniformLocation(EShLanguage /*stage*/, glslang::TVarEntryInfo& ent) override;
};
namespace MobileGL {
class TMglGlslIoResolver: public glslang::TDefaultGlslIoResolver {
public:
using ExplicitVarSlotMap = UnorderedMap<String, Uint>;
TMglGlslIoResolver(const glslang::TIntermediate& intermediate, const ExplicitVarSlotMap& attribLocations):
TDefaultGlslIoResolver(intermediate), m_explicitAttribLocations(attribLocations) {}
TMglGlslIoResolver(const glslang::TProgram& program, const EShLanguage stage, const ExplicitVarSlotMap& attribLocations):
TDefaultGlslIoResolver(*program.getIntermediate(stage)),
m_explicitAttribLocations(attribLocations) {}
void reserverStorageSlot(glslang::TVarEntryInfo& ent, TInfoSink& infoSink) override;
protected:
const ExplicitVarSlotMap& m_explicitAttribLocations;
};
}