Add a ContextImpl class.

src/libANGLE/Context.h

@@ -26,6 +26,7 @@
 
 namespace rx
 {
+class ContextImpl;
 class Renderer;
 }
 
@@ -388,7 +389,7 @@ class Context final : public ValidationContext
 
     void bindUniformLocation(GLuint program, GLint location, const GLchar *name);
 
-    void recordError(const Error &error) override;
+    void handleError(const Error &error) override;
 
     GLenum getError();
     GLenum getResetStatus();
@@ -432,6 +433,8 @@ class Context final : public ValidationContext
 
     void initCaps(GLuint clientVersion);
 
+    std::unique_ptr<rx::ContextImpl> mImplementation;
+
     // Caps to use for validation
     Caps mCaps;
     TextureCapsMap mTextureCaps;

src/libANGLE/ContextState.h

@@ -51,7 +51,7 @@ class ValidationContext : angle::NonCopyable
                       bool skipValidation);
     virtual ~ValidationContext() {}
 
-    virtual void recordError(const Error &error) = 0;
+    virtual void handleError(const Error &error) = 0;
 
     const ContextState &getData() const { return mData; }
     int getClientVersion() const { return mData.clientVersion; }

src/libANGLE/renderer/ContextImpl.h

+//
+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// ContextImpl:
+//   Implementation-specific functionality associated with a GL Context.
+//
+
+#ifndef LIBANGLE_RENDERER_CONTEXTIMPL_H_
+#define LIBANGLE_RENDERER_CONTEXTIMPL_H_
+
+#include "common/angleutils.h"
+#include "libANGLE/Error.h"
+
+namespace rx
+{
+class Renderer;
+
+class ContextImpl : angle::NonCopyable
+{
+  public:
+    ContextImpl() {}
+    virtual ~ContextImpl() {}
+
+    virtual gl::Error initialize(Renderer *renderer) = 0;
+};
+
+}  // namespace rx
+
+#endif  // LIBANGLE_RENDERER_CONTEXTIMPL_H_

src/libANGLE/renderer/ImplFactory.h

@@ -19,6 +19,7 @@ namespace rx
 {
 class BufferImpl;
 class CompilerImpl;
+class ContextImpl;
 class FenceNVImpl;
 class FenceSyncImpl;
 class FramebufferImpl;
@@ -37,6 +38,9 @@ class ImplFactory : angle::NonCopyable
     ImplFactory() {}
     virtual ~ImplFactory() {}
 
+    // Context creation
+    virtual ContextImpl *createContext() = 0;
+
     // Shader creation
     virtual CompilerImpl *createCompiler() = 0;
     virtual ShaderImpl *createShader(const gl::ShaderState &data) = 0;

src/libANGLE/renderer/d3d/d3d11/Context11.h

+//
+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Context11:
+//   D3D11-specific functionality associated with a GL Context.
+//
+
+#ifndef LIBANGLE_RENDERER_D3D_D3D11_CONTEXT11_H_
+#define LIBANGLE_RENDERER_D3D_D3D11_CONTEXT11_H_
+
+#include "libANGLE/renderer/ContextImpl.h"
+
+namespace rx
+{
+
+class Context11 : public ContextImpl
+{
+  public:
+    Context11() {}
+    ~Context11() override {}
+
+    gl::Error initialize(Renderer *renderer) override { return gl::NoError(); }
+};
+
+}  // namespace rx
+
+#endif  // LIBANGLE_RENDERER_D3D_D3D11_CONTEXT11_H_

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -25,6 +25,7 @@
 #include "libANGLE/renderer/d3d/d3d11/Blit11.h"
 #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
 #include "libANGLE/renderer/d3d/d3d11/Clear11.h"
+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
 #include "libANGLE/renderer/d3d/d3d11/dxgi_support_table.h"
 #include "libANGLE/renderer/d3d/d3d11/Fence11.h"
 #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
@@ -1143,6 +1144,11 @@ SwapChainD3D *Renderer11::createSwapChain(NativeWindowD3D *nativeWindow,
                            depthBufferFormat, orientation);
 }
 
+ContextImpl *Renderer11::createContext()
+{
+    return new Context11;
+}
+
 CompilerImpl *Renderer11::createCompiler()
 {
     if (mRenderer11DeviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3)

src/libANGLE/renderer/d3d/d3d11/Renderer11.h

@@ -124,6 +124,8 @@ class Renderer11 : public RendererD3D
                                   GLenum depthBufferFormat,
                                   EGLint orientation) override;
 
+    ContextImpl *createContext() override;
+
     CompilerImpl *createCompiler() override;
 
     virtual gl::Error generateSwizzle(gl::Texture *texture);

src/libANGLE/renderer/d3d/d3d9/Context9.h

+//
+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Context9:
+//   D3D9-specific functionality associated with a GL Context.
+//
+
+#ifndef LIBANGLE_RENDERER_D3D_D3D9_CONTEXT9_H_
+#define LIBANGLE_RENDERER_D3D_D3D9_CONTEXT9_H_
+
+#include "libANGLE/renderer/ContextImpl.h"
+
+namespace rx
+{
+
+class Context9 : public ContextImpl
+{
+  public:
+    Context9() {}
+    ~Context9() override {}
+
+    gl::Error initialize(Renderer *renderer) override { return gl::NoError(); }
+};
+
+}  // namespace rx
+
+#endif  // LIBANGLE_RENDERER_D3D_D3D9_CONTEXT9_H_

src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp

@@ -23,6 +23,7 @@
 #include "libANGLE/Renderbuffer.h"
 #include "libANGLE/renderer/d3d/d3d9/Blit9.h"
 #include "libANGLE/renderer/d3d/d3d9/Buffer9.h"
+#include "libANGLE/renderer/d3d/d3d9/Context9.h"
 #include "libANGLE/renderer/d3d/d3d9/Fence9.h"
 #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
 #include "libANGLE/renderer/d3d/d3d9/Framebuffer9.h"
@@ -680,6 +681,11 @@ SwapChainD3D *Renderer9::createSwapChain(NativeWindowD3D *nativeWindow,
                           depthBufferFormat, orientation);
 }
 
+ContextImpl *Renderer9::createContext()
+{
+    return new Context9;
+}
+
 CompilerImpl *Renderer9::createCompiler()
 {
     return new CompilerD3D(SH_HLSL_3_0_OUTPUT);

src/libANGLE/renderer/d3d/d3d9/Renderer9.h

@@ -90,6 +90,8 @@ class Renderer9 : public RendererD3D
                                   GLenum depthBufferFormat,
                                   EGLint orientation) override;
 
+    ContextImpl *createContext() override;
+
     CompilerImpl *createCompiler() override;
 
     gl::Error allocateEventQuery(IDirect3DQuery9 **outQuery);

src/libANGLE/renderer/gl/ContextGL.h

+//
+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// ContextGL:
+//   OpenGL-specific functionality associated with a GL Context.
+//
+
+#ifndef LIBANGLE_RENDERER_GL_CONTEXTGL_H_
+#define LIBANGLE_RENDERER_GL_CONTEXTGL_H_
+
+#include "libANGLE/renderer/ContextImpl.h"
+
+namespace rx
+{
+
+class ContextGL : public ContextImpl
+{
+  public:
+    ContextGL() {}
+    ~ContextGL() override {}
+
+    gl::Error initialize(Renderer *renderer) override { return gl::NoError(); }
+};
+
+}  // namespace rx
+
+#endif  // LIBANGLE_RENDERER_GL_CONTEXTGL_H_

src/libANGLE/renderer/gl/RendererGL.cpp

@@ -17,6 +17,7 @@
 #include "libANGLE/renderer/gl/BlitGL.h"
 #include "libANGLE/renderer/gl/BufferGL.h"
 #include "libANGLE/renderer/gl/CompilerGL.h"
+#include "libANGLE/renderer/gl/ContextGL.h"
 #include "libANGLE/renderer/gl/FenceNVGL.h"
 #include "libANGLE/renderer/gl/FenceSyncGL.h"
 #include "libANGLE/renderer/gl/FramebufferGL.h"
@@ -262,6 +263,11 @@ gl::Error RendererGL::drawRangeElements(const gl::ContextState &data,
     return gl::Error(GL_NO_ERROR);
 }
 
+ContextImpl *RendererGL::createContext()
+{
+    return new ContextGL;
+}
+
 CompilerImpl *RendererGL::createCompiler()
 {
     return new CompilerGL(mFunctions);

src/libANGLE/renderer/gl/RendererGL.h

@@ -60,6 +60,8 @@ class RendererGL : public Renderer
                                 const GLvoid *indices,
                                 const gl::IndexRange &indexRange) override;
 
+    ContextImpl *createContext() override;
+
     // Shader creation
     CompilerImpl *createCompiler() override;
     ShaderImpl *createShader(const gl::ShaderState &data) override;

src/libANGLE/validationES_unittest.cpp

@@ -38,7 +38,7 @@ class MockValidationContext : public ValidationContext
                           const Limitations &limitations,
                           bool skipValidation);
 
-    MOCK_METHOD1(recordError, void(const Error &));
+    MOCK_METHOD1(handleError, void(const Error &));
 };
 
 MockValidationContext::MockValidationContext(GLint clientVersion,
@@ -110,7 +110,7 @@ TEST(ValidationESTest, DrawElementsWithMaxIndexGivesError)
 
     // Set the expectation for the validation error here.
     Error expectedError(GL_INVALID_OPERATION, g_ExceedsMaxElementErrorMessage);
-    EXPECT_CALL(testContext, recordError(expectedError)).Times(1);
+    EXPECT_CALL(testContext, handleError(expectedError)).Times(1);
 
     // Call once with maximum index, and once with an excessive index.
     GLuint indexData[] = {0, 1, static_cast<GLuint>(caps.maxElementIndex - 1),

src/libGLESv2.gypi

@@ -137,6 +137,7 @@
             'libANGLE/queryconversions.h',
             'libANGLE/renderer/BufferImpl.h',
             'libANGLE/renderer/CompilerImpl.h',
+            'libANGLE/renderer/ContextImpl.h',
             'libANGLE/renderer/DeviceImpl.cpp',
             'libANGLE/renderer/DeviceImpl.h',
             'libANGLE/renderer/DisplayImpl.cpp',
@@ -245,6 +246,7 @@
             'libANGLE/renderer/d3d/d3d9/Blit9.h',
             'libANGLE/renderer/d3d/d3d9/Buffer9.cpp',
             'libANGLE/renderer/d3d/d3d9/Buffer9.h',
+            'libANGLE/renderer/d3d/d3d9/Context9.h',
             'libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp',
             'libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h',
             'libANGLE/renderer/d3d/d3d9/Fence9.cpp',
@@ -296,6 +298,7 @@
             'libANGLE/renderer/d3d/d3d11/Buffer11.h',
             'libANGLE/renderer/d3d/d3d11/Clear11.cpp',
             'libANGLE/renderer/d3d/d3d11/Clear11.h',
+            'libANGLE/renderer/d3d/d3d11/Context11.h',
             'libANGLE/renderer/d3d/d3d11/copyvertex.h',
             'libANGLE/renderer/d3d/d3d11/copyvertex.inl',
             'libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp',
@@ -427,6 +430,7 @@
             'libANGLE/renderer/gl/BufferGL.h',
             'libANGLE/renderer/gl/CompilerGL.cpp',
             'libANGLE/renderer/gl/CompilerGL.h',
+            'libANGLE/renderer/gl/ContextGL.h',
             'libANGLE/renderer/gl/DisplayGL.cpp',
             'libANGLE/renderer/gl/DisplayGL.h',
             'libANGLE/renderer/gl/FenceNVGL.cpp',

src/libGLESv2/global_state.cpp

@@ -133,7 +133,7 @@ Context *GetValidGlobalContext()
     {
         if (context->isContextLost())
         {
-            context->recordError(gl::Error(GL_OUT_OF_MEMORY, "Context has been lost."));
+            context->handleError(gl::Error(GL_OUT_OF_MEMORY, "Context has been lost."));
             return nullptr;
         }
         else

src/tests/angle_unittests_utils.h

@@ -62,6 +62,7 @@ class NullFactory : public ImplFactory
 class MockFactory : public ImplFactory
 {
   public:
+    MOCK_METHOD0(createContext, ContextImpl *());
     MOCK_METHOD0(createCompiler, CompilerImpl *());
     MOCK_METHOD1(createShader, ShaderImpl *(const gl::ShaderState &));
     MOCK_METHOD1(createProgram, ProgramImpl *(const gl::ProgramState &));