Move flush id from WebGraphicsContext3DImpl to GLES2Implementation.

gpu/blink/webgraphicscontext3d_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/blink/webgraphicscontext3d_impl.h"
 
 #include <stdint.h>
 
 #include "base/atomicops.h"
 #include "base/lazy_instance.h"
@@ skipping 24 matching lines @@
 using blink::WGC3Dsizei;
 using blink::WGC3Dsizeiptr;
 using blink::WGC3Dint64;
 using blink::WGC3Duint64;
 using blink::WGC3Duint;
 using blink::WebGLId;
 using blink::WGC3Dsync;
 
 namespace gpu_blink {
 
-namespace {
-
-uint32_t GenFlushID() {
-  static base::subtle::Atomic32 flush_id = 0;
-
-  base::subtle::Atomic32 my_id = base::subtle::Barrier_AtomicIncrement(
-      &flush_id, 1);
-  return static_cast<uint32_t>(my_id);
-}
-
-} // namespace anonymous
-
 class WebGraphicsContext3DErrorMessageCallback
     : public ::gpu::gles2::GLES2ImplementationErrorMessageCallback {
  public:
   WebGraphicsContext3DErrorMessageCallback(
       WebGraphicsContext3DImpl* context)
       : graphics_context_(context) {
   }
 
   void OnErrorMessage(const char* msg, int id) override;
 
@@ skipping 124 matching lines @@
                                     t6 a6, t7 a7, t8 a8, t9 a9, t10 a10,\
                                     t11 a11, t12 a12) {                 \
   gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);       \
 }
 
 WebGraphicsContext3DImpl::WebGraphicsContext3DImpl()
     : initialized_(false),
       initialize_failed_(false),
       context_lost_callback_(0),
       error_message_callback_(0),
-      gl_(NULL),
-      flush_id_(0) {
-}
+      gl_(NULL) {}
 
 WebGraphicsContext3DImpl::~WebGraphicsContext3DImpl() {
 
 }
 
 void WebGraphicsContext3DImpl::synthesizeGLError(WGC3Denum error) {
   if (std::find(synthetic_errors_.begin(), synthetic_errors_.end(), error) ==
       synthetic_errors_.end()) {
     synthetic_errors_.push_back(error);
   }
 }
 
-uint32_t WebGraphicsContext3DImpl::lastFlushID() {
-  return flush_id_;
-}
+DELEGATE_TO_GL_R(lastFlushID, GetLastFlushIdCHROMIUM, WebGLId)
 
 DELEGATE_TO_GL_R(insertFenceSyncCHROMIUM, InsertFenceSyncCHROMIUM, WGC3Duint64)
 
 bool WebGraphicsContext3DImpl::genSyncTokenCHROMIUM(WGC3Duint64 fenceSync,
                                                     WGC3Dbyte* syncToken) {
   gl_->GenSyncTokenCHROMIUM(fenceSync, syncToken);
   return true;
 }
 
 DELEGATE_TO_GL_1(waitSyncTokenCHROMIUM, WaitSyncTokenCHROMIUM, const WGC3Dbyte*)
@@ skipping 137 matching lines @@
   gl_->DrawElements(
       mode, count, type,
       reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
 }
 
 DELEGATE_TO_GL_1(enable, Enable, WGC3Denum)
 
 DELEGATE_TO_GL_1(enableVertexAttribArray, EnableVertexAttribArray,
                  WGC3Duint)
 
-void WebGraphicsContext3DImpl::finish() {
-  flush_id_ = GenFlushID();
-  gl_->Finish();
-}
-
-void WebGraphicsContext3DImpl::flush() {
-  flush_id_ = GenFlushID();
-  gl_->Flush();
-}
+DELEGATE_TO_GL(finish, Finish)
+DELEGATE_TO_GL(flush, Flush)
 
 DELEGATE_TO_GL_4(framebufferRenderbuffer, FramebufferRenderbuffer,
                  WGC3Denum, WGC3Denum, WGC3Denum, WebGLId)
 
 DELEGATE_TO_GL_5(framebufferTexture2D, FramebufferTexture2D,
                  WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint)
 
 DELEGATE_TO_GL_1(frontFace, FrontFace, WGC3Denum)
 
 DELEGATE_TO_GL_1(generateMipmap, GenerateMipmap, WGC3Denum)
@@ skipping 491 matching lines @@
                   WGC3Dint,
                   WGC3Dsizei,
                   WGC3Dsizei,
                   WGC3Dboolean,
                   WGC3Dboolean,
                   WGC3Dboolean);
 
 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
                  WebGLId, WGC3Dint, const WGC3Dchar*)
 
-void WebGraphicsContext3DImpl::shallowFlushCHROMIUM() {
-  flush_id_ = GenFlushID();
-  gl_->ShallowFlushCHROMIUM();
-}
-
-void WebGraphicsContext3DImpl::shallowFinishCHROMIUM() {
-  flush_id_ = GenFlushID();
-  gl_->ShallowFinishCHROMIUM();
-}
+DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM)
+DELEGATE_TO_GL(shallowFinishCHROMIUM, ShallowFinishCHROMIUM)
 
 void WebGraphicsContext3DImpl::loseContextCHROMIUM(
     WGC3Denum current, WGC3Denum other) {
   gl_->LoseContextCHROMIUM(current, other);
   gl_->Flush();
 }
 
 DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*)
 DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM,
                  WGC3Denum, const WGC3Dbyte*)
@@ skipping 386 matching lines @@
       output_attribs->context_type = ::gpu::gles2::CONTEXT_TYPE_WEBGL2;
       break;
     default:
       NOTREACHED();
       output_attribs->context_type = ::gpu::gles2::CONTEXT_TYPE_OPENGLES2;
       break;
   }
 }
 
 }  // namespace gpu_blink