Remove the proxy context.

src/libANGLE/Display.cpp

@@ -387,8 +387,7 @@ Display::Display(EGLenum platform, EGLNativeDisplayType displayId, Device *eglDe
       mPlatform(platform),
       mTextureManager(nullptr),
       mMemoryProgramCache(gl::kDefaultMaxProgramCacheMemoryBytes),
-      mGlobalTextureShareGroupUsers(0),
-      mProxyContext(this)
+      mGlobalTextureShareGroupUsers(0)
 {
 }
 
@@ -420,8 +419,6 @@ Display::~Display()
         UNREACHABLE();
     }
 
-    mProxyContext.reset(nullptr);
-
     SafeDelete(mDevice);
     SafeDelete(mImplementation);
 }
@@ -532,12 +529,6 @@ Error Display::initialize()
         ASSERT(mDevice != nullptr);
     }
 
-    mProxyContext.reset(nullptr);
-    gl::Context *proxyContext =
-        new gl::Context(mImplementation, nullptr, nullptr, nullptr, nullptr, egl::AttributeMap(),
-                        mDisplayExtensions, GetClientExtensions());
-    mProxyContext.reset(proxyContext);
-
     mInitialized = true;
 
     return NoError();
@@ -577,9 +568,6 @@ Error Display::terminate(const Thread *thread)
         ANGLE_TRY(destroySurface(*mState.surfaceSet.begin()));
     }
 
-    // Allow the EGL objects that are being deleted to use the proxy context.
-    mProxyContext.reset(nullptr);
-
     mConfigSet.clear();
 
     if (mDevice != nullptr && mDevice->getOwningDisplay() != nullptr)

src/libANGLE/Display.h

@@ -166,8 +166,6 @@ class Display final : public LabeledObject, angle::NonCopyable
 
     const DisplayState &getState() const { return mState; }
 
-    gl::Context *getProxyContext() const { return mProxyContext.get(); }
-
   private:
     Display(EGLenum platform, EGLNativeDisplayType displayId, Device *eglDevice);
 
@@ -212,10 +210,6 @@ class Display final : public LabeledObject, angle::NonCopyable
     gl::TextureManager *mTextureManager;
     gl::MemoryProgramCache mMemoryProgramCache;
     size_t mGlobalTextureShareGroupUsers;
-
-    // This gl::Context is a simple proxy to the Display for the GL back-end entry points
-    // that need access to implementation-specific data, like a Renderer object.
-    angle::UniqueObjectPointer<gl::Context, Display> mProxyContext;
 };
 
 }  // namespace egl