Moved RefCountObject to common so it can be used by libEGL.

src/build_angle.gyp

@@ -169,6 +169,8 @@
             'common/angleutils.h',
             'common/debug.cpp',
             'common/debug.h',
+            'common/RefCountObject.cpp',
+            'common/RefCountObject.h',
             'common/version.h',
             'libGLESv2/IndexDataManager.cpp',
             'libGLESv2/IndexDataManager.h',
@@ -197,8 +199,6 @@
             'libGLESv2/Program.h',
             'libGLESv2/Query.h',
             'libGLESv2/Query.cpp',
-            'libGLESv2/RefCountObject.cpp',
-            'libGLESv2/RefCountObject.h',
             'libGLESv2/Renderbuffer.cpp',
             'libGLESv2/Renderbuffer.h',
             'libGLESv2/ResourceManager.cpp',
@@ -233,6 +233,8 @@
             'common/angleutils.h',
             'common/debug.cpp',
             'common/debug.h',
+            'common/RefCountObject.cpp',
+            'common/RefCountObject.h',
             'common/version.h',
             'libEGL/Config.cpp',
             'libEGL/Config.h',

src/libGLESv2/RefCountObject.cpp → src/common/RefCountObject.cpp

@@ -11,9 +11,6 @@
 
 #include "RefCountObject.h"
 
-namespace gl
-{
-
 RefCountObject::RefCountObject(GLuint id)
 {
     mId = id;
@@ -48,5 +45,3 @@ void RefCountObjectBindingPointer::set(RefCountObject *newObject)
 
     mObject = newObject;
 }
-
-}

src/libGLESv2/RefCountObject.h → src/common/RefCountObject.h

@@ -9,8 +9,8 @@
 // that need to be reference counted for correct cross-context deletion.
 // (Concretely, textures, buffers and renderbuffers.)
 
-#ifndef LIBGLESV2_REFCOUNTOBJECT_H_
-#define LIBGLESV2_REFCOUNTOBJECT_H_
+#ifndef COMMON_REFCOUNTOBJECT_H_
+#define COMMON_REFCOUNTOBJECT_H_
 
 #include <cstddef>
 
@@ -19,9 +19,6 @@
 
 #include "common/debug.h"
 
-namespace gl
-{
-
 class RefCountObject
 {
   public:
@@ -65,6 +62,4 @@ class BindingPointer : public RefCountObjectBindingPointer
     ObjectType *operator -> () const { return get(); }
 };
 
-}
-
-#endif   // LIBGLESV2_REFCOUNTOBJECT_H_
+#endif   // COMMON_REFCOUNTOBJECT_H_

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 955
+#define BUILD_REVISION 956
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/Buffer.h

@@ -18,7 +18,7 @@
 #include <GLES2/gl2.h>
 
 #include "common/angleutils.h"
-#include "libGLESv2/RefCountObject.h"
+#include "common/RefCountObject.h"
 
 namespace gl
 {

src/libGLESv2/Context.h

@@ -21,9 +21,9 @@
 #include <hash_map>
 
 #include "common/angleutils.h"
+#include "common/RefCountObject.h"
 #include "libGLESv2/ResourceManager.h"
 #include "libGLESv2/HandleAllocator.h"
-#include "libGLESv2/RefCountObject.h"
 
 namespace egl
 {

src/libGLESv2/Framebuffer.h

@@ -15,7 +15,7 @@
 #include <d3d9.h>
 
 #include "common/angleutils.h"
-#include "libGLESv2/RefCountObject.h"
+#include "common/RefCountObject.h"
 
 namespace gl
 {

src/libGLESv2/Query.h

@@ -14,7 +14,7 @@
 #include <d3d9.h>
 
 #include "common/angleutils.h"
-#include "libGLESv2/RefCountObject.h"
+#include "common/RefCountObject.h"
 
 namespace gl
 {

src/libGLESv2/Renderbuffer.h

@@ -17,7 +17,7 @@
 #include <d3d9.h>
 
 #include "common/angleutils.h"
-#include "libGLESv2/RefCountObject.h"
+#include "common/RefCountObject.h"
 
 namespace gl
 {

src/libGLESv2/Texture.h

@@ -17,10 +17,10 @@
 #include <GLES2/gl2.h>
 #include <d3d9.h>
 
+#include "common/debug.h"
+#include "common/RefCountObject.h"
 #include "libGLESv2/Renderbuffer.h"
-#include "libGLESv2/RefCountObject.h"
 #include "libGLESv2/utilities.h"
-#include "common/debug.h"
 
 namespace egl
 {

src/libGLESv2/libGLESv2.vcproj

@@ -397,7 +397,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\RefCountObject.cpp"
+				RelativePath="..\common\RefCountObject.cpp"
 				>
 			</File>
 			<File
@@ -487,7 +487,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\RefCountObject.h"
+				RelativePath="..\common\RefCountObject.h"
 				>
 			</File>
 			<File