commit 8415b5fd4a87f6c3682ca422ea41354350bf2922
author Jamie Madill <jmadill@chromium.org> Tue Apr 26 13:41:39 2016 -0400
committer Jamie Madill <jmadill@chromium.org> Tue May 03 21:21:26 2016 +0000
tree 0da36a08b45848a01448b13233c0430df9b1cbf4
parent 437fa654e3d4ebdfe28118ff8c9bdb609fbaccc1

Pass ContextImpl to Framebuffer methods instead of ContextState.

BUG=angleproject:1363

Change-Id: I7e7524d95f2ca31c35918f9fe5c0cb681ed93616
Reviewed-on: https://chromium-review.googlesource.com/340746
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/FramebufferImpl.h

diff --git a/src/libANGLE/renderer/FramebufferImpl.h b/src/libANGLE/renderer/FramebufferImpl.h
index 9a7654f..a61dbba 100644
--- a/src/libANGLE/renderer/FramebufferImpl.h
+++ b/src/libANGLE/renderer/FramebufferImpl.h
@@ -35,20 +35,20 @@
     virtual gl::Error invalidate(size_t count, const GLenum *attachments) = 0;
     virtual gl::Error invalidateSub(size_t count, const GLenum *attachments, const gl::Rectangle &area) = 0;
 
-    virtual gl::Error clear(const gl::ContextState &data, GLbitfield mask) = 0;
-    virtual gl::Error clearBufferfv(const gl::ContextState &data,
+    virtual gl::Error clear(ContextImpl *context, GLbitfield mask) = 0;
+    virtual gl::Error clearBufferfv(ContextImpl *context,
                                     GLenum buffer,
                                     GLint drawbuffer,
                                     const GLfloat *values) = 0;
-    virtual gl::Error clearBufferuiv(const gl::ContextState &data,
+    virtual gl::Error clearBufferuiv(ContextImpl *context,
                                      GLenum buffer,
                                      GLint drawbuffer,
                                      const GLuint *values) = 0;
-    virtual gl::Error clearBufferiv(const gl::ContextState &data,
+    virtual gl::Error clearBufferiv(ContextImpl *context,
                                     GLenum buffer,
                                     GLint drawbuffer,
                                     const GLint *values) = 0;
-    virtual gl::Error clearBufferfi(const gl::ContextState &data,
+    virtual gl::Error clearBufferfi(ContextImpl *context,
                                     GLenum buffer,
                                     GLint drawbuffer,
                                     GLfloat depth,
@@ -56,10 +56,17 @@
 
     virtual GLenum getImplementationColorReadFormat() const = 0;
     virtual GLenum getImplementationColorReadType() const = 0;
-    virtual gl::Error readPixels(const gl::State &state, const gl::Rectangle &area, GLenum format, GLenum type, GLvoid *pixels) const = 0;
+    virtual gl::Error readPixels(ContextImpl *context,
+                                 const gl::Rectangle &area,
+                                 GLenum format,
+                                 GLenum type,
+                                 GLvoid *pixels) const = 0;
 
-    virtual gl::Error blit(const gl::State &state, const gl::Rectangle &sourceArea, const gl::Rectangle &destArea,
-                           GLbitfield mask, GLenum filter, const gl::Framebuffer *sourceFramebuffer) = 0;
+    virtual gl::Error blit(ContextImpl *context,
+                           const gl::Rectangle &sourceArea,
+                           const gl::Rectangle &destArea,
+                           GLbitfield mask,
+                           GLenum filter) = 0;
 
     virtual bool checkStatus() const = 0;