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

[Fix, Test] (MG_State, MG_Backend/DirectGLES, MG_Util, MG_IntegrationTest, MG_Test): array layout(binding=N) elements bind consecutively, a read+write image reaches ESSL legally, compute local_size comes from the linked intermediate, and glShaderStorageBlockBinding is baked into the generated source

Browse Source
This commit is contained in:
swung0x48
2026-08-11 23:05:21 -04:00
parent 794c10e56c
commit bcb0e894ef
14 changed files with 1313 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_Util/ShaderTranspiler/SpvcSession.cpp
+37
View File
@@ -289,6 +289,43 @@ namespace MobileGL {
SPVC_CHK_RETURN
}
spvc_result SpvcSession::SetShaderStorageBlockBinding(const UnorderedMap<String, Int>& bindings) {
if (!(usage & SessionUsageBit::Transpile)) return SPVC_ERROR_INVALID_ARGUMENT;
SPVC_CHK_INIT
const spvc_reflected_resource* list = nullptr;
size_t count = 0;
SPVC_CHK_RESULT(spvc_resources_get_resource_list_for_type(
resources, SPVC_RESOURCE_TYPE_STORAGE_BUFFER, &list, &count));
for (size_t i = 0; i < count; ++i) {
auto& resource = list[i];
// Two spellings, because neither one alone identifies the block the GL
// interface query named. `resource.name` is the block's instance name when
// the declaration has one; the block TYPE name (which is what the GL query
// reports for a block) lives on base_type_id. An arrayed block collapses to
// a single SPIR-V resource while GL enumerates it per element, so the bare
// name is also tried with element zero's subscript - the same convention
// ProgramObject::GetShaderStorageBlockBindingOverride documents.
const char* blockTypeName = spvc_compiler_get_name(compiler, resource.base_type_id);
const String candidates[] = {
blockTypeName != nullptr ? String(blockTypeName) : String(),
resource.name != nullptr ? String(resource.name) : String(),
};
for (const auto& candidate : candidates) {
if (candidate.empty()) continue;
auto it = bindings.find(candidate);
if (it == bindings.end()) it = bindings.find(candidate + "[0]");
if (it == bindings.end()) continue;
// Negative is "never rebound" - the declared qualifier still stands.
if (it->second < 0) break;
spvc_compiler_set_decoration(compiler, resource.id, SpvDecorationBinding,
static_cast<unsigned>(it->second));
break;
}
}
SPVC_CHK_RETURN
}
spvc_result SpvcSession::Compile(const char** result) {
if (!(usage & SessionUsageBit::Transpile)) return SPVC_ERROR_INVALID_ARGUMENT;
SPVC_CHK_INIT