Fix crash on eglDestroyContext.

src/GLES2/libEGL/libEGL.cpp

@@ -839,6 +839,19 @@ EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurfac
         egl::Display *display = static_cast<egl::Display*>(dpy);
         egl::Context *context = static_cast<egl::Context*>(ctx);
 
+		if(ctx != EGL_NO_CONTEXT || draw != EGL_NO_SURFACE || read != EGL_NO_SURFACE)
+		{
+			if(!validateDisplay(display))
+			{
+				return EGL_FALSE;
+			}
+		}
+
+		if(ctx == EGL_NO_CONTEXT && (draw != EGL_NO_SURFACE || read != EGL_NO_SURFACE))
+		{
+			return error(EGL_BAD_MATCH, EGL_FALSE);
+		}
+
         if(ctx != EGL_NO_CONTEXT && !validateContext(display, context))
         {
             return EGL_FALSE;
@@ -850,6 +863,11 @@ EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurfac
             return EGL_FALSE;
         }
 
+		if((draw != EGL_NO_SURFACE) ^ (read != EGL_NO_SURFACE))
+		{
+			return error(EGL_BAD_MATCH, EGL_FALSE);
+		}
+
         if(draw != read)
         {
             UNIMPLEMENTED();   // FIXME

src/GLES2/libGLES_CM/Context.cpp

@@ -255,11 +255,6 @@ void Context::makeCurrent(egl::Surface *surface)
 
 void Context::destroy()
 {
-	if(this == getContext())
-	{
-		makeCurrent(0);
-	}
-
 	delete this;
 }
 

src/GLES2/libGLESv2/Context.cpp

@@ -267,11 +267,6 @@ void Context::makeCurrent(egl::Surface *surface)
 
 void Context::destroy()
 {
-	if(this == getContext())
-	{
-		makeCurrent(0);
-	}
-
 	delete this;
 }