commit bb0a0bbd3f4e1869377a3bdeaf5a3b339e697133
author Geoff Lang <geofflang@chromium.org> Fri Mar 27 12:16:57 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Wed Apr 15 18:07:03 2015 +0000
tree 1aa0ebd3ad5ec23cdf5dc8057deb4a1902aa7dfe
parent cfaeaa9f67638cdf2fdee72ad4d39bbeb7104bcb

Rename TransformFeedback members to match the spec.

BUG=angleproject:763

Change-Id: I12fa57de9263eb0cb5ff1840cf44b0a8f2a40912
Reviewed-on: https://chromium-review.googlesource.com/263721
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/State.cpp

diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
index 1e34c63..eaa132a 100644
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -851,7 +851,7 @@
 bool State::isTransformFeedbackActiveUnpaused() const
 {
     gl::TransformFeedback *curTransformFeedback = getCurrentTransformFeedback();
-    return curTransformFeedback && curTransformFeedback->isStarted() && !curTransformFeedback->isPaused();
+    return curTransformFeedback && curTransformFeedback->isActive() && !curTransformFeedback->isPaused();
 }
 
 void State::detachTransformFeedback(GLuint transformFeedback)
@@ -1149,8 +1149,8 @@
       case GL_DEPTH_TEST:                *params = mDepthStencil.depthTest;       break;
       case GL_BLEND:                     *params = mBlend.blend;                  break;
       case GL_DITHER:                    *params = mBlend.dither;                 break;
-      case GL_TRANSFORM_FEEDBACK_ACTIVE: *params = getCurrentTransformFeedback()->isStarted(); break;
-      case GL_TRANSFORM_FEEDBACK_PAUSED: *params = getCurrentTransformFeedback()->isPaused();  break;
+      case GL_TRANSFORM_FEEDBACK_ACTIVE: *params = getCurrentTransformFeedback()->isActive() ? GL_TRUE : GL_FALSE; break;
+      case GL_TRANSFORM_FEEDBACK_PAUSED: *params = getCurrentTransformFeedback()->isPaused() ? GL_TRUE : GL_FALSE; break;
       default:
         UNREACHABLE();
         break;