commit 9082b982b9c377384563d85dafa24ad717cd58c5
author Jamie Madill <jmadill@chromium.org> Wed Apr 27 15:21:51 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Apr 29 01:47:03 2016 +0000
tree 673dc11ad14319016b1a8064c3f90e45d89fdd95
parent 9b8b359fa3615be7c7492239a48f61103b2e4fcc

Rename gl::Data to gl::ContextState.

Part of the new world order of renaming the Obj::Data classes to ObjState.

BUG=angleproject:1363

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

src/libANGLE/Framebuffer.cpp

diff --git a/src/libANGLE/Framebuffer.cpp b/src/libANGLE/Framebuffer.cpp
index 28b7cab..04cd30e 100644
--- a/src/libANGLE/Framebuffer.cpp
+++ b/src/libANGLE/Framebuffer.cpp
@@ -386,7 +386,7 @@
     return false;
 }
 
-GLenum Framebuffer::checkStatus(const gl::Data &data) const
+GLenum Framebuffer::checkStatus(const ContextState &data) const
 {
     // The default framebuffer *must* always be complete, though it may not be
     // subject to the same rules as application FBOs. ie, it could have 0x0 size.
@@ -612,7 +612,7 @@
     return mImpl->invalidateSub(count, attachments, area);
 }
 
-Error Framebuffer::clear(const gl::Data &data, GLbitfield mask)
+Error Framebuffer::clear(const ContextState &data, GLbitfield mask)
 {
     if (data.state->isRasterizerDiscardEnabled())
     {
@@ -622,7 +622,7 @@
     return mImpl->clear(data, mask);
 }
 
-Error Framebuffer::clearBufferfv(const gl::Data &data,
+Error Framebuffer::clearBufferfv(const ContextState &data,
                                  GLenum buffer,
                                  GLint drawbuffer,
                                  const GLfloat *values)
@@ -635,7 +635,7 @@
     return mImpl->clearBufferfv(data, buffer, drawbuffer, values);
 }
 
-Error Framebuffer::clearBufferuiv(const gl::Data &data,
+Error Framebuffer::clearBufferuiv(const ContextState &data,
                                   GLenum buffer,
                                   GLint drawbuffer,
                                   const GLuint *values)
@@ -648,7 +648,7 @@
     return mImpl->clearBufferuiv(data, buffer, drawbuffer, values);
 }
 
-Error Framebuffer::clearBufferiv(const gl::Data &data,
+Error Framebuffer::clearBufferiv(const ContextState &data,
                                  GLenum buffer,
                                  GLint drawbuffer,
                                  const GLint *values)
@@ -661,7 +661,7 @@
     return mImpl->clearBufferiv(data, buffer, drawbuffer, values);
 }
 
-Error Framebuffer::clearBufferfi(const gl::Data &data,
+Error Framebuffer::clearBufferfi(const ContextState &data,
                                  GLenum buffer,
                                  GLint drawbuffer,
                                  GLfloat depth,
@@ -716,7 +716,7 @@
     return mImpl->blit(state, sourceArea, destArea, mask, filter, sourceFramebuffer);
 }
 
-int Framebuffer::getSamples(const gl::Data &data) const
+int Framebuffer::getSamples(const ContextState &data) const
 {
     if (checkStatus(data) == GL_FRAMEBUFFER_COMPLETE)
     {