commit 1a5c4deed3e33efd7f286a570cf88fbd2d861010
author Pablo Ceballos <pceballos@google.com> Mon Apr 25 20:40:08 2016 +0000
committer Pablo Ceballos <pceballos@google.com> Tue Apr 26 13:28:11 2016 +0000
tree 4b0ca748bb2e934f117ebacb56bc059492b8891c
parent 541de498ec7356c5e4af92500cf2fb8fc707fd50

Revert "EGL: Ensure surfaces are disconnected when destroyed"

This reverts commit 541de498ec7356c5e4af92500cf2fb8fc707fd50.

Bug 28295465

Change-Id: If81ed4a5a73a9612579b58291c37c7830ea1f7db

opengl/libs/EGL/egl_object.h

diff --git a/opengl/libs/EGL/egl_object.h b/opengl/libs/EGL/egl_object.h
index 8268900..17a8304 100644
--- a/opengl/libs/EGL/egl_object.h
+++ b/opengl/libs/EGL/egl_object.h
@@ -40,12 +40,11 @@
 class egl_display_t;
 
 class egl_object_t {
+    egl_display_t *display;
     mutable volatile int32_t count;
 
 protected:
     virtual ~egl_object_t();
-    virtual void terminate();
-    egl_display_t *display;
 
 public:
     egl_object_t(egl_display_t* display);
@@ -56,6 +55,7 @@
     inline egl_display_t* getDisplay() const { return display; }
 
 private:
+    void terminate();
     static bool get(egl_display_t const* display, egl_object_t* object);
 
 public:
@@ -143,7 +143,6 @@
 class egl_context_t: public egl_object_t {
 protected:
     ~egl_context_t() {}
-    void terminate() override;
 public:
     typedef egl_object_t::LocalRef<egl_context_t, EGLContext> Ref;