LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

metal: fix vertex attribute locations not being set correctly.

Browse Source
This commit is contained in:
Sasha Szpakowski
2024-09-08 15:08:10 -03:00
parent 247effb43b
commit 2c288715d4
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/metal/Shader.mm
+32 -12
View File
@@ -453,24 +453,44 @@ void Shader::compileFromGLSLang(id<MTLDevice> device, const glslang::TProgram &p
if (stageindex == SHADERSTAGE_VERTEX) if (stageindex == SHADERSTAGE_VERTEX)
{ {
int nextattributeindex = ATTRIB_MAX_ENUM; uint64 usedInputLocationBits = 0;
// First pass: record active input locations that were set to a valid value
// beforehand.
for (const auto &var : interfacevars) for (const auto &var : interfacevars)
{ {
spv::StorageClass storage = msl.get_storage_class(var); if (msl.get_storage_class(var) == spv::StorageClassInput)
const std::string &name = msl.get_name(var);
if (storage == spv::StorageClassInput)
{ {
int index = 0; const std::string &name = msl.get_name(var);
BuiltinVertexAttribute builtinattribute; auto it = reflection.vertexInputs.find(name);
if (graphics::getConstant(name.c_str(), builtinattribute)) if (it != reflection.vertexInputs.end() && it->second >= 0)
index = (int) builtinattribute; usedInputLocationBits |= (1ull << it->second);
else }
index = nextattributeindex++; }
// Second pass: set input locations which were not part of the above pass,
// they need to not overlap. And then store all input locations for later use.
for (const auto &var : interfacevars)
{
if (msl.get_storage_class(var) == spv::StorageClassInput)
{
const std::string &name = msl.get_name(var);
auto it = reflection.vertexInputs.find(name);
if (it == reflection.vertexInputs.end() || it->second < 0)
{
for (int i = 0; i < 64; i++)
{
if ((usedInputLocationBits & (1ull << i)) == 0)
{
usedInputLocationBits |= (1ull << i);
msl.set_decoration(var, spv::DecorationLocation, i);
break;
}
}
}
msl.set_decoration(var, spv::DecorationLocation, index);
attributes[name] = msl.get_decoration(var, spv::DecorationLocation); attributes[name] = msl.get_decoration(var, spv::DecorationLocation);
} }
} }