Remove the GLState class.

Author: domchen

Diff for: tgfx/src/gpu/opengl/GLContext.cpp

@@ -20,8 +20,7 @@
 #include "gpu/opengl/GLDevice.h"
 
 namespace tgfx {
-GLContext::GLContext(Device* device, const GLInterface* glInterface) : Context(device) {
-  glState = std::make_unique<GLState>(glInterface);
-  interface = GLInterface::HookWithState(glInterface, glState.get());
+GLContext::GLContext(Device* device, const GLInterface* glInterface)
+    : Context(device), interface(glInterface) {
 }
 }  // namespace tgfx

Diff for: tgfx/src/gpu/opengl/GLContext.h

@@ -19,7 +19,6 @@
 #pragma once
 
 #include "GLInterface.h"
-#include "GLState.h"
 #include "gpu/Context.h"
 
 namespace tgfx {
@@ -42,8 +41,7 @@ class GLContext : public Context {
   }
 
  private:
-  std::unique_ptr<const GLInterface> interface = nullptr;
-  std::unique_ptr<GLState> glState = nullptr;
+  const GLInterface* interface = nullptr;
 
   friend class GLDevice;
   friend class GLInterface;

Diff for: tgfx/src/gpu/opengl/GLDevice.cpp

@@ -66,12 +66,6 @@ bool GLDevice::onLockContext() {
     onClearCurrent();
     return false;
   }
-  auto glContext = static_cast<GLContext*>(context);
-  if (isAdopted) {
-    glContext->glState->reset();
-    // Clear externally generated GLError.
-    CheckGLError(glContext->interface.get());
-  }
   return true;
 }
 

Diff for: tgfx/src/gpu/opengl/GLInterface.cpp

@@ -17,13 +17,11 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "GLInterface.h"
-
 #include <mutex>
 #include <unordered_map>
 #include "GLAssembledGLESInterface.h"
 #include "GLAssembledGLInterface.h"
 #include "GLAssembledWebGLInterface.h"
-#include "GLState.h"
 #include "GLUtil.h"
 
 namespace tgfx {
@@ -43,7 +41,7 @@ static int GetGLVersion(const GLProcGetter* getter) {
 }
 
 const GLInterface* GLInterface::Get(const Context* context) {
-  return context ? static_cast<const GLContext*>(context)->interface.get() : nullptr;
+  return context ? static_cast<const GLContext*>(context)->interface : nullptr;
 }
 
 const GLInterface* GLInterface::GetNative() {
@@ -64,49 +62,6 @@ const GLInterface* GLInterface::GetNative() {
   return glInterfaceMap[version].get();
 }
 
-namespace {
-template <typename R, typename... Args>
-GLFunction<R GL_FUNCTION_TYPE(Args...)> Bind(GLState* interface, R (GLState::*member)(Args...)) {
-  return [interface, member](Args... a) -> R { return (interface->*member)(a...); };
-}
-}  // anonymous namespace
-
-#ifdef TGFX_BUILD_FOR_WEB
-#define Hook(X) state
-#else
-#define Hook(X) functions->X = Bind(state, &GLState::X)
-#endif
-
-std::unique_ptr<const GLInterface> GLInterface::HookWithState(const GLInterface* gl,
-                                                              GLState* state) {
-  auto functions = std::make_shared<GLFunctions>();
-  *functions = *gl->functions;
-  Hook(activeTexture);
-  Hook(blendEquation);
-  Hook(blendFunc);
-  Hook(bindFramebuffer);
-  Hook(bindRenderbuffer);
-  Hook(bindBuffer);
-  Hook(bindTexture);
-  Hook(disable);
-  Hook(disableVertexAttribArray);
-  Hook(enable);
-  Hook(enableVertexAttribArray);
-  Hook(pixelStorei);
-  Hook(scissor);
-  Hook(viewport);
-  Hook(useProgram);
-  Hook(vertexAttribPointer);
-  Hook(depthMask);
-  if (gl->caps->vertexArrayObjectSupport) {
-    Hook(bindVertexArray);
-  }
-  auto interface = new GLInterface();
-  interface->functions = functions;
-  interface->caps = gl->caps;
-  return std::unique_ptr<const GLInterface>(interface);
-}
-
 std::unique_ptr<const GLInterface> GLInterface::MakeNativeInterface(const GLProcGetter* getter) {
   if (getter == nullptr) {
     return nullptr;

Diff for: tgfx/src/gpu/opengl/GLInterface.h

@@ -36,7 +36,6 @@ class GLInterface {
  private:
   static const GLInterface* GetNative();
   static std::unique_ptr<const GLInterface> MakeNativeInterface(const GLProcGetter* getter);
-  static std::unique_ptr<const GLInterface> HookWithState(const GLInterface* gl, GLState* state);
 
   friend class GLDevice;
   friend class GLContext;

Diff for: tgfx/src/gpu/opengl/GLRenderTarget.cpp

@@ -19,7 +19,6 @@
 #include "gpu/opengl/GLRenderTarget.h"
 #include "core/Bitmap.h"
 #include "gpu/opengl/GLContext.h"
-#include "gpu/opengl/GLState.h"
 #include "gpu/opengl/GLUtil.h"
 
 namespace tgfx {