Fix attribute location binding

- Attribute location aliasing was allowed prior to shader version 300, so location aliasing is now possible. - Attribute binding refers to the linked location of attributes, so locations set using glBindAttribLocation() will only be returned by glGetAttribLocation() after the program is linked. Before that, it will return the location allocated during the previous glLinkProgram() call. In order to do that, an extra map was added. "linkedAttributeLocation" represents the attributes' location, as a result of linking a program. "attributeBinding" represents the attributes' future location, when the next program linking occurs. On top of that, the shader's version was not being passed down from TranslatorASM to es2::Shader, or from es2::Shader to Program, so this information also needed to be properly transferred. Fixes all failures in: dEQP-GLES3.functional.attribute_location* Change-Id: I4ba7dc7c2f6d444e805cadeb5445f5ff371c3d95 Reviewed-on: https://swiftshader-review.googlesource.com/14568Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Fix attribute location binding
23f54d74 · Alexis Hetu · Alexis Hétu · c61f46b8 · 23f54d74 · 23f54d74
Commit 23f54d74 authored Dec 05, 2017 by Alexis Hetu Committed by Alexis Hétu Dec 06, 2017
Showing with 7 additions and 3 deletions

OutputASM.h src/OpenGL/compiler/OutputASM.h +2 -0

Program.cpp src/OpenGL/libGLESv2/Program.cpp +0 -0

Program.h src/OpenGL/libGLESv2/Program.h +4 -2

Shader.cpp src/OpenGL/libGLESv2/Shader.cpp +1 -1

No files found.
--- a/src/OpenGL/compiler/OutputASM.h
+++ b/src/OpenGL/compiler/OutputASM.h
@@ -185,12 +185,14 @@ namespace glsl
 		virtual sw::Shader *getShader() const = 0;
 		virtual sw::PixelShader *getPixelShader() const;
 		virtual sw::VertexShader *getVertexShader() const;
+		int getShaderVersion() const { return shaderVersion; }

 	protected:
 		VaryingList varyings;
 		ActiveUniforms activeUniforms;
 		ActiveAttributes activeAttributes;
 		ActiveUniformBlocks activeUniformBlocks;
+		int shaderVersion;
 	};

 	struct Function

--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
--- a/src/OpenGL/libGLESv2/Program.h
+++ b/src/OpenGL/libGLESv2/Program.h
@@ -26,6 +26,7 @@
 #include <string>
 #include <vector>
 #include <set>
+#include <unordered_map>

 namespace es2
 {
@@ -279,8 +280,9 @@ namespace es2
 		sw::PixelShader *pixelBinary;
 		sw::VertexShader *vertexBinary;

-		std::set<std::string> attributeBinding[MAX_VERTEX_ATTRIBS];
-		glsl::Attribute linkedAttribute[MAX_VERTEX_ATTRIBS];
+		std::unordered_map<std::string, GLuint> attributeBinding;
+		std::unordered_map<std::string, GLuint> linkedAttributeLocation;
+		std::vector<glsl::Attribute> linkedAttribute;
 		int attributeStream[MAX_VERTEX_ATTRIBS];

 		GLuint uniformBlockBindings[MAX_UNIFORM_BUFFER_BINDINGS];

--- a/src/OpenGL/libGLESv2/Shader.cpp
+++ b/src/OpenGL/libGLESv2/Shader.cpp
@@ -230,7 +230,7 @@ void Shader::compile()
 		serial++;
 	}

-	int shaderVersion = compiler->getShaderVersion();
+	shaderVersion = compiler->getShaderVersion();
 	int clientVersion = es2::getContext()->getClientVersion();

 	if(shaderVersion >= 300 && clientVersion < 3)