Revert to old behavior for swap buffers

include/gpu/gl/SkGLContext.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkGLContext_DEFINED
 #define SkGLContext_DEFINED
 
@@ skipping 34 matching lines @@
     GrGLint createTextureRectangle(int width, int height, GrGLenum internalFormat,
                                    GrGLenum externalFormat, GrGLenum externalType,
                                    GrGLvoid* data);
 
     /**
      * Used for testing EGLImage integration. Takes a EGLImage and wraps it in a
      * GL_TEXTURE_EXTERNAL_OES.
      */
     virtual GrGLuint eglImageToExternalTexture(GrEGLImage) const { return 0; }
 
+    void swapBuffers();
+
     /**
      * The only purpose of this function it to provide a means of scheduling
      * work on the GPU (since all of the subclasses create primary buffers for
      * testing that are small and not meant to be rendered to the screen).
      *
      * If the platform supports fence sync (OpenGL 3.2+ or EGL_KHR_fence_sync),
      * this will not swap any buffers, but rather emulate triple buffer
      * synchronization using fences.
      *
      * Otherwise it will call the platform SwapBuffers method. This may or may
      * not perform some sort of synchronization, depending on whether the
      * drawing surface provided by the platform is double buffered.
      */
-    void swapBuffers();
+    void waitOnSyncOrSwap();
 
     /**
      * This notifies the context that we are deliberately testing abandoning
      * the context. It is useful for debugging contexts that would otherwise
      * test that GPU resources are properly deleted. It also allows a debugging
      * context to test that further GL calls are not made by Skia GPU code.
      */
     void testAbandon();
 
     /**
@@ skipping 50 matching lines @@
  * SK_GL(glCtx, GenTextures(1, &texID));
  */
 #define SK_GL(ctx, X) (ctx).gl()->fFunctions.f ## X;    \
                       SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
 #define SK_GL_RET(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X;    \
                   SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
 #define SK_GL_NOERRCHECK(ctx, X) (ctx).gl()->fFunctions.f ## X
 #define SK_GL_RET_NOERRCHECK(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X
 
 #endif