Eliminate the destroyContext() dependency.

src/GLES2/libEGL/Display.cpp

@@ -430,7 +430,7 @@ void Display::destroySurface(egl::Surface *surface)
 
 void Display::destroyContext(gl::Context *context)
 {
-    gl::destroyContext(context);
+    context->destroy();
     mContextSet.erase(context);
 }
 

src/GLES2/libEGL/main.cpp

@@ -90,7 +90,6 @@ CONSTRUCTOR static bool eglAttachProcess()
     libGLESv2 = loadLibrary(libGLESv2_lib);
     gl::createDevice = (gl::Device*(*)())getProcAddress(libGLESv2, "createDevice");
     gl::createContext = (gl::Context *(*)(const egl::Config*, const gl::Context*))getProcAddress(libGLESv2, "glCreateContext");
-    gl::destroyContext = (void (*)(gl::Context*))getProcAddress(libGLESv2, "glDestroyContext");
     gl::makeCurrent = (void (*)(gl::Context*, egl::Display*, egl::Surface*))getProcAddress(libGLESv2, "glMakeCurrent");
     gl::getCurrentContext = (gl::Context *(*)())getProcAddress(libGLESv2, "glGetCurrentContext");
     gl::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libGLESv2, "glGetProcAddress");
@@ -249,7 +248,6 @@ namespace gl
 {
 	Device *(*createDevice)() = 0;
 	Context *(*createContext)(const egl::Config *config, const Context *shareContext) = 0;
-	void (*destroyContext)(Context *context) = 0;
 	void (*bindTexImage)(egl::Surface *surface) = 0;
 	void (*makeCurrent)(Context *context, egl::Display *display, egl::Surface *surface) = 0;
 	Context *(*getCurrentContext)() = 0;

src/GLES2/libEGL/main.h

@@ -84,7 +84,6 @@ namespace gl
 
 	extern Device *(*createDevice)();
 	extern Context *(*createContext)(const egl::Config *config, const Context *shareContext);
-	extern void (*destroyContext)(Context *context);
 	extern void (*bindTexImage)(egl::Surface *surface);
 	extern void (*makeCurrent)(Context *context, egl::Display *display, egl::Surface *surface);
 	extern Context *(*getCurrentContext)();

src/GLES2/libGLES_CM/Context.cpp

@@ -167,6 +167,16 @@ Context::~Context()
     mResourceManager->release();
 }
 
+void Context::destroy()
+{
+	if(this == gl::getContext())
+	{
+		gl::makeCurrent(NULL, NULL, NULL);
+	}
+
+	delete this;
+}
+
 void Context::makeCurrent(egl::Display *display, egl::Surface *surface)
 {
     Device *device = display->getDevice();
@@ -2217,16 +2227,6 @@ extern "C"
 		return new gl::Context(config, shareContext);
 	}
 
-	void glDestroyContext(gl::Context *context)
-	{
-		delete context;
-
-		if(context == gl::getContext())
-		{
-			gl::makeCurrent(NULL, NULL, NULL);
-		}
-	}
-
 	void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *surface)
 	{
 		gl::makeCurrent(context, display, surface);

src/GLES2/libGLES_CM/Context.h

@@ -219,10 +219,10 @@ struct State
 
 class Context
 {
-  public:
+public:
     Context(const egl::Config *config, const Context *shareContext);
 
-    virtual ~Context();
+	virtual void destroy();
 
     void makeCurrent(egl::Display *display, egl::Surface *surface);
 
@@ -366,7 +366,9 @@ class Context
 
     static int getSupportedMultiSampleDepth(sw::Format format, int requested);
 
-  private:
+private:
+	virtual ~Context();
+
     bool applyRenderTarget();
     void applyState(GLenum drawMode);
     GLenum applyVertexBuffer(GLint base, GLint first, GLsizei count);

src/GLES2/libGLES_CM/libGLES_CM.def

@@ -147,7 +147,6 @@ EXPORTS
 
     ; EGL dependencies
     glCreateContext                 @144
-    glDestroyContext                @145
     glMakeCurrent                   @146
     glGetCurrentContext             @147
     glGetProcAddress                @148

src/GLES2/libGLESv2/Context.cpp

@@ -215,6 +215,16 @@ Context::~Context()
     mResourceManager->release();
 }
 
+void Context::destroy()
+{
+	if(this == gl::getContext())
+	{
+		gl::makeCurrent(NULL, NULL, NULL);
+	}
+
+	delete this;
+}
+
 void Context::makeCurrent(egl::Display *display, egl::Surface *surface)
 {
     Device *device = display->getDevice();
@@ -3030,16 +3040,6 @@ extern "C"
 		return new gl::Context(config, shareContext);
 	}
 
-	void glDestroyContext(gl::Context *context)
-	{
-		delete context;
-
-		if(context == gl::getContext())
-		{
-			gl::makeCurrent(NULL, NULL, NULL);
-		}
-	}
-
 	void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *surface)
 	{
 		gl::makeCurrent(context, display, surface);

src/GLES2/libGLESv2/Context.h

@@ -237,10 +237,10 @@ struct State
 
 class Context
 {
-  public:
+public:
     Context(const egl::Config *config, const Context *shareContext);
 
-    virtual ~Context();
+	virtual void destroy();
 
     void makeCurrent(egl::Display *display, egl::Surface *surface);
 
@@ -418,7 +418,9 @@ class Context
                          GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                          GLbitfield mask);
 
-  private:
+private:
+	virtual ~Context();
+
     bool applyRenderTarget();
     void applyState(GLenum drawMode);
     GLenum applyVertexBuffer(GLint base, GLint first, GLsizei count);

src/GLES2/libGLESv2/libGLESv2.def

@@ -170,7 +170,6 @@ EXPORTS
 
     ; EGL dependencies
     glCreateContext                 @144
-    glDestroyContext                @145
     glMakeCurrent                   @146
     glGetCurrentContext             @147
     glGetProcAddress                @148