commit a9ca8e2025368aaf613915cc12e7e1bd1aa4befe
author Geoff Lang <geofflang@chromium.org> Thu Oct 22 14:34:20 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Thu Oct 22 14:34:31 2015 +0000
tree f4aa7e87bf0d909f5f98ea3e6cb1300903d5dc24
parent a9c5288192f90ebf03b0d26d86964b4fbce74bcb

Revert "Implement TransformFeedbackGL."

Failing on AMD Linux bots.

This reverts commit a9c5288192f90ebf03b0d26d86964b4fbce74bcb.

Change-Id: I2a2db8c3d96c4b927d7d784486c6df772ae63084
Reviewed-on: https://chromium-review.googlesource.com/308130
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index cef4037..fb1683e 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -38,7 +38,7 @@
 
 void MarkTransformFeedbackBufferUsage(gl::TransformFeedback *transformFeedback)
 {
-    if (transformFeedback && transformFeedback->isActive() && !transformFeedback->isPaused())
+    if (transformFeedback->isActive() && !transformFeedback->isPaused())
     {
         for (size_t tfBufferIndex = 0; tfBufferIndex < transformFeedback->getIndexedBufferCount();
              tfBufferIndex++)
@@ -138,16 +138,12 @@
     bindPixelPackBuffer(0);
     bindPixelUnpackBuffer(0);
 
-    if (mClientVersion >= 3)
-    {
-        // [OpenGL ES 3.0.2] section 2.14.1 pg 85:
-        // In the initial state, a default transform feedback object is bound and treated as
-        // a transform feedback object with a name of zero. That object is bound any time
-        // BindTransformFeedback is called with id of zero
-        mTransformFeedbackZero.set(
-            new TransformFeedback(mRenderer->createTransformFeedback(), 0, mCaps));
-        bindTransformFeedback(0);
-    }
+    // [OpenGL ES 3.0.2] section 2.14.1 pg 85:
+    // In the initial state, a default transform feedback object is bound and treated as
+    // a transform feedback object with a name of zero. That object is bound any time
+    // BindTransformFeedback is called with id of zero
+    mTransformFeedbackZero.set(new TransformFeedback(mRenderer->createTransformFeedback(), 0, mCaps));
+    bindTransformFeedback(0);
 
     mHasBeenCurrent = false;
     mContextLost = false;
@@ -192,7 +188,7 @@
     mTransformFeedbackZero.set(NULL);
     for (auto transformFeedback : mTransformFeedbackMap)
     {
-        transformFeedback.second->release();
+        SafeDelete(transformFeedback.second);
     }
 
     for (auto &zeroTexture : mZeroTextures)