commit 5597eef8fe02d8f0d3cd451db5867a293167d82b
author Nicolas Capens <capn@google.com> Thu Jan 22 09:33:04 2015 -0500
committer Nicolas Capens <capn@google.com> Thu Jan 22 18:38:58 2015 +0000
tree 8db1043be453d8de621da8b911cbdf05b41be07a
parent 68754bf1c1b64da46a729de6b34ab1b8130baaff

Rename the GLSL shader compiler namespace to glsl.

Bug 18962347

Change-Id: I28d001045cf43eed2d92cb0007330dffa620025b
Reviewed-on: https://swiftshader-review.googlesource.com/1760
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/OpenGL/libGL/Program.h

diff --git a/src/OpenGL/libGL/Program.h b/src/OpenGL/libGL/Program.h
index 4afb55b..844ccdf 100644
--- a/src/OpenGL/libGL/Program.h
+++ b/src/OpenGL/libGL/Program.h
@@ -133,7 +133,7 @@
 	private:

 		void unlink();

 

-		int packVaryings(const sh::Varying *packing[][4]);

+		int packVaryings(const glsl::Varying *packing[][4]);

 		bool linkVaryings();

 

 		bool linkAttributes();

@@ -171,7 +171,7 @@
 		sw::VertexShader *vertexBinary;

     

 		std::set<std::string> attributeBinding[MAX_VERTEX_ATTRIBS];

-		sh::Attribute linkedAttribute[MAX_VERTEX_ATTRIBS];

+		glsl::Attribute linkedAttribute[MAX_VERTEX_ATTRIBS];

 		int attributeStream[MAX_VERTEX_ATTRIBS];

 

 		struct Sampler