ContextImpl: Make flush/finish take a gl::Context.

src/libANGLE/Context.cpp

@@ -1760,12 +1760,12 @@ void Context::drawElementsIndirect(GLenum mode, GLenum type, const void *indirec
 
 void Context::flush()
 {
-    handleError(mImplementation->flush());
+    handleError(mImplementation->flush(this));
 }
 
 void Context::finish()
 {
-    handleError(mImplementation->finish());
+    handleError(mImplementation->finish(this));
 }
 
 void Context::insertEventMarker(GLsizei length, const char *marker)

src/libANGLE/renderer/ContextImpl.h

@@ -36,8 +36,8 @@ class ContextImpl : public GLImplFactory
     virtual gl::Error initialize() = 0;
 
     // Flush and finish.
-    virtual gl::Error flush()  = 0;
-    virtual gl::Error finish() = 0;
+    virtual gl::Error flush(const gl::Context *context)  = 0;
+    virtual gl::Error finish(const gl::Context *context) = 0;
 
     // Drawing methods.
     virtual gl::Error drawArrays(const gl::Context *context,

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

@@ -147,12 +147,12 @@ std::vector<PathImpl *> Context11::createPaths(GLsizei)
     return std::vector<PathImpl *>();
 }
 
-gl::Error Context11::flush()
+gl::Error Context11::flush(const gl::Context *context)
 {
     return mRenderer->flush();
 }
 
-gl::Error Context11::finish()
+gl::Error Context11::finish(const gl::Context *context)
 {
     return mRenderer->finish();
 }

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

@@ -63,8 +63,8 @@ class Context11 : public ContextImpl
     std::vector<PathImpl *> createPaths(GLsizei) override;
 
     // Flush and finish.
-    gl::Error flush() override;
-    gl::Error finish() override;
+    gl::Error flush(const gl::Context *context) override;
+    gl::Error finish(const gl::Context *context) override;
 
     // Drawing methods.
     gl::Error drawArrays(const gl::Context *context,

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

@@ -131,12 +131,12 @@ std::vector<PathImpl *> Context9::createPaths(GLsizei)
     return std::vector<PathImpl *>();
 }
 
-gl::Error Context9::flush()
+gl::Error Context9::flush(const gl::Context *context)
 {
     return mRenderer->flush();
 }
 
-gl::Error Context9::finish()
+gl::Error Context9::finish(const gl::Context *context)
 {
     return mRenderer->finish();
 }

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

@@ -63,8 +63,8 @@ class Context9 : public ContextImpl
     std::vector<PathImpl *> createPaths(GLsizei) override;
 
     // Flush and finish.
-    gl::Error flush() override;
-    gl::Error finish() override;
+    gl::Error flush(const gl::Context *context) override;
+    gl::Error finish(const gl::Context *context) override;
 
     // Drawing methods.
     gl::Error drawArrays(const gl::Context *context,

src/libANGLE/renderer/gl/ContextGL.cpp

@@ -148,12 +148,12 @@ std::vector<PathImpl *> ContextGL::createPaths(GLsizei range)
     return ret;
 }
 
-gl::Error ContextGL::flush()
+gl::Error ContextGL::flush(const gl::Context *context)
 {
     return mRenderer->flush();
 }
 
-gl::Error ContextGL::finish()
+gl::Error ContextGL::finish(const gl::Context *context)
 {
     return mRenderer->finish();
 }

src/libANGLE/renderer/gl/ContextGL.h

@@ -71,8 +71,8 @@ class ContextGL : public ContextImpl
     std::vector<PathImpl *> createPaths(GLsizei range) override;
 
     // Flush and finish.
-    gl::Error flush() override;
-    gl::Error finish() override;
+    gl::Error flush(const gl::Context *context) override;
+    gl::Error finish(const gl::Context *context) override;
 
     // Drawing methods.
     gl::Error drawArrays(const gl::Context *context,

src/libANGLE/renderer/null/ContextNULL.cpp

@@ -103,12 +103,12 @@ gl::Error ContextNULL::initialize()
     return gl::NoError();
 }
 
-gl::Error ContextNULL::flush()
+gl::Error ContextNULL::flush(const gl::Context *context)
 {
     return gl::NoError();
 }
 
-gl::Error ContextNULL::finish()
+gl::Error ContextNULL::finish(const gl::Context *context)
 {
     return gl::NoError();
 }

src/libANGLE/renderer/null/ContextNULL.h

@@ -39,8 +39,8 @@ class ContextNULL : public ContextImpl
     gl::Error initialize() override;
 
     // Flush and finish.
-    gl::Error flush() override;
-    gl::Error finish() override;
+    gl::Error flush(const gl::Context *context) override;
+    gl::Error finish(const gl::Context *context) override;
 
     // Drawing methods.
     gl::Error drawArrays(const gl::Context *context,

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -236,13 +236,13 @@ gl::Error ContextVk::initialize()
     return gl::NoError();
 }
 
-gl::Error ContextVk::flush()
+gl::Error ContextVk::flush(const gl::Context *context)
 {
     UNIMPLEMENTED();
     return gl::InternalError();
 }
 
-gl::Error ContextVk::finish()
+gl::Error ContextVk::finish(const gl::Context *context)
 {
     // TODO(jmadill): Implement finish.
     // UNIMPLEMENTED();

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -30,8 +30,8 @@ class ContextVk : public ContextImpl, public ResourceVk
     void onDestroy(const gl::Context *context) override;
 
     // Flush and finish.
-    gl::Error flush() override;
-    gl::Error finish() override;
+    gl::Error flush(const gl::Context *context) override;
+    gl::Error finish(const gl::Context *context) override;
 
     // Drawing methods.
     gl::Error drawArrays(const gl::Context *context,