commit 2ba4abbb3171e058b7f9b1d7c7954ee6989a21e6
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 12:39:20 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 12:39:20 2011 +0000
tree fd164083784a6770f0710b8dd9e8df7942f2f7c5
parent 6aef1fb4ebf8b8b2ed352eb81e961565fbbd56cb

Switch to GrGpuGLShaders (instead of GrGpuGLShaders2).

git-svn-id: http://skia.googlecode.com/svn/trunk@1251 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrGpuFactory.cpp

diff --git a/gpu/src/GrGpuFactory.cpp b/gpu/src/GrGpuFactory.cpp
index 0e316a4..642a55b 100644
--- a/gpu/src/GrGpuFactory.cpp
+++ b/gpu/src/GrGpuFactory.cpp
@@ -55,10 +55,10 @@
         case kOpenGL_Shaders_GrEngine:
             GrAssert(NULL == context3D);
             {
-#if GR_USE_NEW_GLSHADERS
-                gpu = new GrGpuGLShaders;
-#else
+#if 0 // old code path, will be removed soon
                 gpu = new GrGpuGLShaders2;
+#else
+                gpu = new GrGpuGLShaders;
 #endif
             }
             break;