commit ae6ba9f83dd0923e38d05768a1d3ff91a462cffa
author Jamie Madill <jmadill@chromium.org> Fri Dec 21 23:00:04 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Sat Dec 22 05:14:33 2018 +0000
tree 682684b0ee6df68d9ff8c40a9e7944398d0eadee
parent 1e85326695b5150d20d404ed6596f49452bd01ff

Optimize check for active not paused XFB.

Local testing showed an improved score of about 2% in the most
sensitive CPU overhead benchmark. Likely because of improved
caching from fewer indirections.

Bug: angleproject:2966
Change-Id: I5d9a4b4bcf624ab0b430bb696c4227e589cdb7a6
Reviewed-on: https://chromium-review.googlesource.com/c/1359518
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index ec13562..5a62efe 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -132,12 +132,12 @@
 }
 
 ANGLE_INLINE void MarkTransformFeedbackBufferUsage(const Context *context,
-                                                   TransformFeedback *transformFeedback,
                                                    GLsizei count,
                                                    GLsizei instanceCount)
 {
-    if (transformFeedback && transformFeedback->isActive() && !transformFeedback->isPaused())
+    if (context->getStateCache().isTransformFeedbackActiveUnpaused())
     {
+        TransformFeedback *transformFeedback = context->getGLState().getCurrentTransformFeedback();
         transformFeedback->onVerticesDrawn(context, count, instanceCount);
     }
 }
@@ -2221,7 +2221,7 @@
 
     ANGLE_CONTEXT_TRY(prepareForDraw(mode));
     ANGLE_CONTEXT_TRY(mImplementation->drawArrays(this, mode, first, count));
-    MarkTransformFeedbackBufferUsage(this, mGLState.getCurrentTransformFeedback(), count, 1);
+    MarkTransformFeedbackBufferUsage(this, count, 1);
 }
 
 void Context::drawArraysInstanced(PrimitiveMode mode,
@@ -2238,8 +2238,7 @@
     ANGLE_CONTEXT_TRY(prepareForDraw(mode));
     ANGLE_CONTEXT_TRY(
         mImplementation->drawArraysInstanced(this, mode, first, count, instanceCount));
-    MarkTransformFeedbackBufferUsage(this, mGLState.getCurrentTransformFeedback(), count,
-                                     instanceCount);
+    MarkTransformFeedbackBufferUsage(this, count, instanceCount);
 }
 
 void Context::drawElements(PrimitiveMode mode,
@@ -5406,8 +5405,7 @@
             programObject->setDrawIDUniform(drawID);
             ANGLE_CONTEXT_TRY(
                 mImplementation->drawArrays(this, mode, firsts[drawID], counts[drawID]));
-            MarkTransformFeedbackBufferUsage(this, mGLState.getCurrentTransformFeedback(),
-                                             counts[drawID], 1);
+            MarkTransformFeedbackBufferUsage(this, counts[drawID], 1);
         }
     }
     else
@@ -5420,8 +5418,7 @@
             }
             ANGLE_CONTEXT_TRY(
                 mImplementation->drawArrays(this, mode, firsts[drawID], counts[drawID]));
-            MarkTransformFeedbackBufferUsage(this, mGLState.getCurrentTransformFeedback(),
-                                             counts[drawID], 1);
+            MarkTransformFeedbackBufferUsage(this, counts[drawID], 1);
         }
     }
 }
@@ -5446,8 +5443,7 @@
             programObject->setDrawIDUniform(drawID);
             ANGLE_CONTEXT_TRY(mImplementation->drawArraysInstanced(
                 this, mode, firsts[drawID], counts[drawID], instanceCounts[drawID]));
-            MarkTransformFeedbackBufferUsage(this, mGLState.getCurrentTransformFeedback(),
-                                             counts[drawID], instanceCounts[drawID]);
+            MarkTransformFeedbackBufferUsage(this, counts[drawID], instanceCounts[drawID]);
         }
     }
     else
@@ -5460,8 +5456,7 @@
             }
             ANGLE_CONTEXT_TRY(mImplementation->drawArraysInstanced(
                 this, mode, firsts[drawID], counts[drawID], instanceCounts[drawID]));
-            MarkTransformFeedbackBufferUsage(this, mGLState.getCurrentTransformFeedback(),
-                                             counts[drawID], instanceCounts[drawID]);
+            MarkTransformFeedbackBufferUsage(this, counts[drawID], instanceCounts[drawID]);
         }
     }
 }
@@ -8192,7 +8187,8 @@
       mCachedNonInstancedVertexElementLimit(0),
       mCachedInstancedVertexElementLimit(0),
       mCachedBasicDrawStatesError(kInvalidPointer),
-      mCachedBasicDrawElementsError(kInvalidPointer)
+      mCachedBasicDrawElementsError(kInvalidPointer),
+      mCachedTransformFeedbackActiveUnpaused(false)
 {}
 
 StateCache::~StateCache() = default;
@@ -8375,6 +8371,7 @@
 
 void StateCache::onActiveTransformFeedbackChange(Context *context)
 {
+    updateTransformFeedbackActiveUnpaused(context);
     updateBasicDrawStatesError();
     updateBasicDrawElementsError();
     updateValidDrawModes(context);
@@ -8415,10 +8412,10 @@
     const State &state = context->getGLState();
     Program *program   = state.getProgram();
 
-    TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
-    if (curTransformFeedback && curTransformFeedback->isActive() &&
-        !curTransformFeedback->isPaused())
+    if (mCachedTransformFeedbackActiveUnpaused)
     {
+        TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
+
         // ES Spec 3.0 validation text:
         // When transform feedback is active and not paused, all geometric primitives generated must
         // match the value of primitiveMode passed to BeginTransformFeedback. The error
@@ -8495,4 +8492,10 @@
         {DrawElementsType::UnsignedInt, supportsUint},
     }};
 }
+
+void StateCache::updateTransformFeedbackActiveUnpaused(Context *context)
+{
+    TransformFeedback *xfb = context->getGLState().getCurrentTransformFeedback();
+    mCachedTransformFeedbackActiveUnpaused = xfb && xfb->isActive() && !xfb->isPaused();
+}
 }  // namespace gl