Refactor GL objects into named and unnamed ones.

Bug 20045861

Change-Id: Ib6a6625d3eb876a1444ae4dab17c6e25246fbc43
Reviewed-on: https://swiftshader-review.googlesource.com/2794
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGL/Buffer.cpp b/src/OpenGL/libGL/Buffer.cpp
index 7c7b3f1..f4d7a52 100644
--- a/src/OpenGL/libGL/Buffer.cpp
+++ b/src/OpenGL/libGL/Buffer.cpp
@@ -21,7 +21,7 @@
 namespace gl
 {
 
-Buffer::Buffer(GLuint name) : Object(name)
+Buffer::Buffer(GLuint name) : NamedObject(name)
 {
     mContents = 0;
     mSize = 0;
diff --git a/src/OpenGL/libGL/Buffer.h b/src/OpenGL/libGL/Buffer.h
index 6e6a1ee..dcccc3d 100644
--- a/src/OpenGL/libGL/Buffer.h
+++ b/src/OpenGL/libGL/Buffer.h
@@ -29,7 +29,7 @@
 

 namespace gl

 {

-class Buffer : public Object

+class Buffer : public NamedObject

 {

   public:

     explicit Buffer(GLuint name);

diff --git a/src/OpenGL/libGL/Query.cpp b/src/OpenGL/libGL/Query.cpp
index be97611..9ef0790 100644
--- a/src/OpenGL/libGL/Query.cpp
+++ b/src/OpenGL/libGL/Query.cpp
@@ -19,7 +19,7 @@
 namespace gl

 {

 

-Query::Query(GLuint name, GLenum type) : Object(name)

+Query::Query(GLuint name, GLenum type) : NamedObject(name)

 { 

     mQuery = NULL;

     mStatus = GL_FALSE;

diff --git a/src/OpenGL/libGL/Query.h b/src/OpenGL/libGL/Query.h
index 6efd4fd..138e488 100644
--- a/src/OpenGL/libGL/Query.h
+++ b/src/OpenGL/libGL/Query.h
@@ -26,7 +26,7 @@
 namespace gl

 {

 

-class Query : public Object

+class Query : public NamedObject

 {

   public:

     Query(GLuint name, GLenum type);

diff --git a/src/OpenGL/libGL/Renderbuffer.cpp b/src/OpenGL/libGL/Renderbuffer.cpp
index db49371..95887b5 100644
--- a/src/OpenGL/libGL/Renderbuffer.cpp
+++ b/src/OpenGL/libGL/Renderbuffer.cpp
@@ -180,7 +180,7 @@
 
 ////// Renderbuffer Implementation //////
 
-Renderbuffer::Renderbuffer(GLuint name, RenderbufferInterface *instance) : Object(name)
+Renderbuffer::Renderbuffer(GLuint name, RenderbufferInterface *instance) : NamedObject(name)
 {
 	ASSERT(instance != NULL);
 	mInstance = instance;
diff --git a/src/OpenGL/libGL/Renderbuffer.h b/src/OpenGL/libGL/Renderbuffer.h
index 62b9e0a..50b7afb 100644
--- a/src/OpenGL/libGL/Renderbuffer.h
+++ b/src/OpenGL/libGL/Renderbuffer.h
@@ -134,7 +134,7 @@
 // Renderbuffer implements the GL renderbuffer object.

 // It's only a proxy for a RenderbufferInterface instance; the internal object

 // can change whenever glRenderbufferStorage is called.

-class Renderbuffer : public Object

+class Renderbuffer : public NamedObject

 {

 public:

 	Renderbuffer(GLuint name, RenderbufferInterface *storage);

diff --git a/src/OpenGL/libGL/Texture.cpp b/src/OpenGL/libGL/Texture.cpp
index 137b39f..74c1daa 100644
--- a/src/OpenGL/libGL/Texture.cpp
+++ b/src/OpenGL/libGL/Texture.cpp
@@ -27,7 +27,7 @@
 namespace gl

 {

 

-Texture::Texture(GLuint name) : Object(name)

+Texture::Texture(GLuint name) : NamedObject(name)

 {

     mMinFilter = GL_NEAREST_MIPMAP_LINEAR;

     mMagFilter = GL_LINEAR;

diff --git a/src/OpenGL/libGL/Texture.h b/src/OpenGL/libGL/Texture.h
index 82327f2..2a524b5 100644
--- a/src/OpenGL/libGL/Texture.h
+++ b/src/OpenGL/libGL/Texture.h
@@ -44,7 +44,7 @@
 	IMPLEMENTATION_MAX_SAMPLES = 4

 };

 

-class Texture : public Object

+class Texture : public NamedObject

 {

 public:

     explicit Texture(GLuint name);