GL: Refactor TextureGL to not hold renderer objects.

src/libANGLE/Surface.cpp

@@ -138,7 +138,7 @@ Error Surface::destroyImpl(const Display *display)
         {
             return Error(EGL_BAD_SURFACE);
         }
-        mTexture.set(nullptr, nullptr);
+        mTexture.set(display->getProxyContext(), nullptr);
     }
 
     if (mState.defaultFramebuffer)

src/libANGLE/renderer/gl/BlitGL.cpp

@@ -523,10 +523,10 @@ gl::ErrorOrResult<bool> BlitGL::copySubTexture(const gl::Context *context,
         }
 
         GLint swizzle[4] = {luminance, luminance, luminance, alpha};
-        source->setSwizzle(swizzle);
+        source->setSwizzle(context, swizzle);
     }
-    source->setMinFilter(GL_NEAREST);
-    source->setMagFilter(GL_NEAREST);
+    source->setMinFilter(context, GL_NEAREST);
+    source->setMagFilter(context, GL_NEAREST);
     ANGLE_TRY(source->setBaseLevel(context, static_cast<GLuint>(sourceLevel)));
 
     // Render to the destination texture, sampling from the source texture

src/libANGLE/renderer/gl/ContextGL.cpp

@@ -75,8 +75,14 @@ FramebufferImpl *ContextGL::createFramebuffer(const gl::FramebufferState &data)
 
 TextureImpl *ContextGL::createTexture(const gl::TextureState &state)
 {
-    return new TextureGL(state, getFunctions(), getWorkaroundsGL(), getStateManager(),
-                         mRenderer->getBlitter());
+    const FunctionsGL *functions = getFunctions();
+    StateManagerGL *stateManager = getStateManager();
+
+    GLuint texture = 0;
+    functions->genTextures(1, &texture);
+    stateManager->bindTexture(state.getType(), texture);
+
+    return new TextureGL(state, texture);
 }
 
 RenderbufferImpl *ContextGL::createRenderbuffer(const gl::RenderbufferState &state)

src/libANGLE/renderer/gl/TextureGL.h

@@ -56,13 +56,11 @@ struct LevelInfoGL
 class TextureGL : public TextureImpl
 {
   public:
-    TextureGL(const gl::TextureState &state,
-              const FunctionsGL *functions,
-              const WorkaroundsGL &workarounds,
-              StateManagerGL *stateManager,
-              BlitGL *blitter);
+    TextureGL(const gl::TextureState &state, GLuint id);
     ~TextureGL() override;
 
+    gl::Error onDestroy(const gl::Context *context) override;
+
     gl::Error setImage(const gl::Context *context,
                        const gl::ImageIndex &index,
                        GLenum internalFormat,
@@ -174,13 +172,14 @@ class TextureGL : public TextureImpl
     gl::Error initializeContents(const gl::Context *context,
                                  const gl::ImageIndex &imageIndex) override;
 
-    void setMinFilter(GLenum filter);
-    void setMagFilter(GLenum filter);
+    void setMinFilter(const gl::Context *context, GLenum filter);
+    void setMagFilter(const gl::Context *context, GLenum filter);
 
-    void setSwizzle(GLint swizzle[4]);
+    void setSwizzle(const gl::Context *context, GLint swizzle[4]);
 
   private:
-    void setImageHelper(gl::TextureTarget target,
+    void setImageHelper(const gl::Context *context,
+                        gl::TextureTarget target,
                         size_t level,
                         GLenum internalFormat,
                         const gl::Extents &size,
@@ -188,7 +187,8 @@ class TextureGL : public TextureImpl
                         GLenum type,
                         const uint8_t *pixels);
     // This changes the current pixel unpack state that will have to be reapplied.
-    void reserveTexImageToBeFilled(gl::TextureTarget target,
+    void reserveTexImageToBeFilled(const gl::Context *context,
+                                   gl::TextureTarget target,
                                    size_t level,
                                    GLenum internalFormat,
                                    const gl::Extents &size,
@@ -230,11 +230,6 @@ class TextureGL : public TextureImpl
     const LevelInfoGL &getLevelInfo(gl::TextureTarget target, size_t level) const;
     const LevelInfoGL &getBaseLevelInfo() const;
 
-    const FunctionsGL *mFunctions;
-    const WorkaroundsGL &mWorkarounds;
-    StateManagerGL *mStateManager;
-    BlitGL *mBlitter;
-
     std::vector<LevelInfoGL> mLevelInfo;
     gl::Texture::DirtyBits mLocalDirtyBits;