Sort shader program input attributes by name

The lookup requires this.  It seems to have gotten broken in 2576b61, but
since the only user is InstanceArray, it wasn't noticed until now.

diff --git a/source/backends/opengl/program_backend.cpp b/source/backends/opengl/program_backend.cpp
index e83a94844dc4e79e28986e0d8dcf8e835e9cad7e..ce865cf3a0b53417dc0463902d5f9bd20a623b04 100644 (file)
--- a/source/backends/opengl/program_backend.cpp
+++ b/source/backends/opengl/program_backend.cpp
@@ -444,6 +444,8 @@ void OpenGLProgram::query_attributes()
                        info.type = from_gl_type(type);
                }
        }
+
+       sort_member(reflect_data.attributes, &ReflectData::AttributeInfo::name);
 }
 
 void OpenGLProgram::finalize_uniforms()

diff --git a/source/core/program.cpp b/source/core/program.cpp
index f8c35ec573ed9b1437ecb63879cca00b00b9d7ff..a82ac1d227279be4edd1175428af8e6c0dfe6ffd 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -193,6 +193,8 @@ void Program::collect_attributes(const SpirVModule &mod)
                                        info.type = v->type;
                                }
                }
+
+       sort_member(reflect_data.attributes, &ReflectData::AttributeInfo::name);
 }
 
 void Program::collect_builtins(const SpirVModule &mod)