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

[Fix] (MG_Util/Program): Avoid uniform variables conflicting.

Browse Source
This commit is contained in:
BZLZHH
2025-07-05 11:56:15 +08:00
parent 4cf85c4f2a
commit 164c2f25d4
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MG/MG_UTIL/Program/GLSLTool.cpp
+37 -10
View File
@@ -794,15 +794,47 @@ namespace MG_Util::Program {
const spvc_reflected_resource &res = *res_ptr; const spvc_reflected_resource &res = *res_ptr;
const char *name = res.name; const char *name = res.name;
if (name[0] == '_') continue; if (name[0] == '_') continue;
unsigned spirv_location = spvc_compiler_get_decoration(compiler, res.id, unsigned spirv_location = spvc_compiler_get_decoration(compiler, res.id,
SpvDecorationLocation); SpvDecorationLocation);
GLint final_location; GLint final_location;
if (spirv_location > 0) { spvc_type_id type_id = res.type_id;
if (used_locations.find(spirv_location) != used_locations.end()) { spvc_type type = spvc_compiler_get_type_handle(compiler, type_id);
infoLog += "\nLocation conflict for uniform: " + std::string(name); spvc_basetype base_type = spvc_type_get_basetype(type);
continue; GLenum gl_type = GL_NONE;
if (spirv_location > 0 && base_type != SPVC_BASETYPE_SAMPLED_IMAGE) {
auto conflict_it = used_locations.find(spirv_location);
if (conflict_it != used_locations.end()) {
// Check if the conflicting uniform is a sampler
std::string conflicting_name;
for (const auto& entry : prog.uniformLocations) {
if (entry.second == spirv_location) {
conflicting_name = entry.first;
break;
}
}
if(conflicting_name == std::string(name)) {
continue;
} else if (!conflicting_name.empty() && prog.uniformValues.count(conflicting_name) &&
MG_GL::GL::IsSamplerType(prog.uniformValues[conflicting_name].type)) {
// Reassign location for the sampler
GLint new_sampler_loc = auto_location++;
while (used_locations.find(new_sampler_loc) != used_locations.end()) new_sampler_loc++;
prog.uniformLocations[conflicting_name] = new_sampler_loc;
used_locations.erase(conflict_it); // Remove old sampler location
used_locations.insert(new_sampler_loc); // Add new sampler location
} else {
infoLog += "\nLocation conflict for uniform: " + std::string(name) + " at location " + std::to_string(spirv_location);
infoLog += "\nExisting uniforms and locations:";
for (const auto& entry : prog.uniformLocations) {
infoLog += "\n " + entry.first + ": " + std::to_string(entry.second);
}
infoLog += "\nUsed locations set:";
for (GLint loc : used_locations) infoLog += " " + std::to_string(loc);
continue;
}
} }
final_location = spirv_location; final_location = spirv_location;
} else { } else {
@@ -814,11 +846,6 @@ namespace MG_Util::Program {
used_locations.insert(final_location); used_locations.insert(final_location);
spvc_type_id type_id = res.type_id;
spvc_type type = spvc_compiler_get_type_handle(compiler, type_id);
spvc_basetype base_type = spvc_type_get_basetype(type);
GLenum gl_type = GL_NONE;
if (base_type == SPVC_BASETYPE_SAMPLED_IMAGE) { if (base_type == SPVC_BASETYPE_SAMPLED_IMAGE) {
SpvDim dim = spvc_type_get_image_dimension(type); SpvDim dim = spvc_type_get_image_dimension(type);
bool is_array = spvc_type_get_image_arrayed(type); bool is_array = spvc_type_get_image_arrayed(type);