commit c3dc5d485771ea74f8aa84e0b560a0415bb2f4c0
author Jamie Madill <jmadill@chromium.org> Sun Dec 30 12:12:04 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Jan 01 17:11:01 2019 +0000
tree 67fc2fd12fa996b11871daa62891f968fb469639
parent 957eb07f59bcb9fe8b6a194f61dfbd57ed711b25

Merge gl::Context and gl::ContextState.

This reduces the number of indrections when accessing the Extensions
or Caps structures. It will provide a small speed-up to some methods.
It also cleans up the code.

Bug: angleproject:2966
Change-Id: Idddac70758c42c1c2b75c885d0cacc8a5c458685
Reviewed-on: https://chromium-review.googlesource.com/c/1392391
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Markus Tavenrath <matavenrath@nvidia.com>

src/libANGLE/Context.inl.h

diff --git a/src/libANGLE/Context.inl.h b/src/libANGLE/Context.inl.h
index 117da6d..6f138de 100644
--- a/src/libANGLE/Context.inl.h
+++ b/src/libANGLE/Context.inl.h
@@ -41,7 +41,7 @@
 {
     if (context->getStateCache().isTransformFeedbackActiveUnpaused())
     {
-        TransformFeedback *transformFeedback = context->getGLState().getCurrentTransformFeedback();
+        TransformFeedback *transformFeedback = context->getState().getCurrentTransformFeedback();
         transformFeedback->onVerticesDrawn(context, count, instanceCount);
     }
 }
@@ -56,35 +56,35 @@
 
 ANGLE_INLINE angle::Result Context::syncDirtyBits()
 {
-    const State::DirtyBits &dirtyBits = mGLState.getDirtyBits();
+    const State::DirtyBits &dirtyBits = mState.getDirtyBits();
     ANGLE_TRY(mImplementation->syncState(this, dirtyBits, mAllDirtyBits));
-    mGLState.clearDirtyBits();
+    mState.clearDirtyBits();
     return angle::Result::Continue;
 }
 
 ANGLE_INLINE angle::Result Context::syncDirtyBits(const State::DirtyBits &bitMask)
 {
-    const State::DirtyBits &dirtyBits = (mGLState.getDirtyBits() & bitMask);
+    const State::DirtyBits &dirtyBits = (mState.getDirtyBits() & bitMask);
     ANGLE_TRY(mImplementation->syncState(this, dirtyBits, bitMask));
-    mGLState.clearDirtyBits(dirtyBits);
+    mState.clearDirtyBits(dirtyBits);
     return angle::Result::Continue;
 }
 
 ANGLE_INLINE angle::Result Context::syncDirtyObjects(const State::DirtyObjects &objectMask)
 {
-    return mGLState.syncDirtyObjects(this, objectMask);
+    return mState.syncDirtyObjects(this, objectMask);
 }
 
 ANGLE_INLINE angle::Result Context::prepareForDraw(PrimitiveMode mode)
 {
     if (mGLES1Renderer)
     {
-        ANGLE_TRY(mGLES1Renderer->prepareForDraw(mode, this, &mGLState));
+        ANGLE_TRY(mGLES1Renderer->prepareForDraw(mode, this, &mState));
     }
 
     ANGLE_TRY(syncDirtyObjects(mDrawDirtyObjects));
     ASSERT(!isRobustResourceInitEnabled() ||
-           !mGLState.getDrawFramebuffer()->hasResourceThatNeedsInit());
+           !mState.getDrawFramebuffer()->hasResourceThatNeedsInit());
     return syncDirtyBits();
 }
 
@@ -124,8 +124,9 @@
 
 ANGLE_INLINE void Context::bindBuffer(BufferBinding target, GLuint buffer)
 {
-    Buffer *bufferObject = mState.mBuffers->checkBufferAllocation(mImplementation.get(), buffer);
-    mGLState.setBufferBinding(this, target, bufferObject);
+    Buffer *bufferObject =
+        mState.mBufferManager->checkBufferAllocation(mImplementation.get(), buffer);
+    mState.setBufferBinding(this, target, bufferObject);
     mStateCache.onBufferBindingChange(this);
 }