Renaming UniformBufferBinding to BufferBinding

src/OpenGL/libGLESv2/Buffer.h

@@ -60,24 +60,24 @@ class Buffer : public gl::NamedObject
 	GLbitfield mAccess;
 };
 
-class UniformBufferBinding
+class BufferBinding
 {
 public:
-	UniformBufferBinding() : offset(0), size(0) { }
+	BufferBinding() : offset(0), size(0) { }
 
-	void set(Buffer *newUniformBuffer, int newOffset = 0, int newSize = 0)
+	void set(Buffer *newBuffer, int newOffset = 0, int newSize = 0)
 	{
-		uniformBuffer = newUniformBuffer;
+		buffer = newBuffer;
 		offset = newOffset;
 		size = newSize;
 	}
 
 	int getOffset() const { return offset; }
 	int getSize() const { return size; }
-	const gl::BindingPointer<Buffer>& get() const { return uniformBuffer; }
+	const gl::BindingPointer<Buffer>& get() const { return buffer; }
 
 private:
-	gl::BindingPointer<Buffer> uniformBuffer;
+	gl::BindingPointer<Buffer> buffer;
 	int offset;
 	int size;
 };

src/OpenGL/libGLESv2/Context.cpp

@@ -2389,7 +2389,7 @@ template bool Context::getUniformBufferiv<GLint64>(GLuint index, GLenum pname, G
 
 template<typename T> bool Context::getUniformBufferiv(GLuint index, GLenum pname, T *param) const
 {
-	const UniformBufferBinding& uniformBuffer = mState.uniformBuffers[index];
+	const BufferBinding& uniformBuffer = mState.uniformBuffers[index];
 
 	switch(pname)
 	{

src/OpenGL/libGLESv2/Context.h

@@ -379,7 +379,7 @@ struct State
 	gl::BindingPointer<Buffer> pixelPackBuffer;
 	gl::BindingPointer<Buffer> pixelUnpackBuffer;
 	gl::BindingPointer<Buffer> genericUniformBuffer;
-	UniformBufferBinding uniformBuffers[MAX_UNIFORM_BUFFER_BINDINGS];
+	BufferBinding uniformBuffers[MAX_UNIFORM_BUFFER_BINDINGS];
 
     GLuint readFramebuffer;
     GLuint drawFramebuffer;

src/OpenGL/libGLESv2/Program.cpp

@@ -1132,7 +1132,7 @@ namespace es2
 		}
 	}
 
-	void Program::applyUniformBuffers(UniformBufferBinding* uniformBuffers)
+	void Program::applyUniformBuffers(BufferBinding* uniformBuffers)
 	{
 		GLint vertexUniformBuffers[IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS];
 		GLint fragmentUniformBuffers[IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS];

src/OpenGL/libGLESv2/Program.h

@@ -167,7 +167,7 @@ namespace es2
 
 		void dirtyAllUniforms();
 		void applyUniforms();
-		void applyUniformBuffers(UniformBufferBinding* uniformBuffers);
+		void applyUniformBuffers(BufferBinding* uniformBuffers);
 
 		void link();
 		bool isLinked() const;

src/OpenGL/libGLESv2/TransformFeedback.h

@@ -50,7 +50,7 @@ public:
 
 private:
 	gl::BindingPointer<Buffer> mGenericBuffer;
-	UniformBufferBinding mBuffer[MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS];
+	BufferBinding mBuffer[MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS];
 
 	bool mActive;
 	bool mPaused;