Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: gpu/blink/webgraphicscontext3d_impl.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mock gpu video accelerator factory Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/blink/webgraphicscontext3d_impl.h" 5 #include "gpu/blink/webgraphicscontext3d_impl.h"
6 6
7 #include "base/atomicops.h" 7 #include "base/atomicops.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "gpu/GLES2/gl2extchromium.h" 10 #include "gpu/GLES2/gl2extchromium.h"
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 void WebGraphicsContext3DImpl::shallowFlushCHROMIUM() { 873 void WebGraphicsContext3DImpl::shallowFlushCHROMIUM() {
874 flush_id_ = GenFlushID(); 874 flush_id_ = GenFlushID();
875 gl_->ShallowFlushCHROMIUM(); 875 gl_->ShallowFlushCHROMIUM();
876 } 876 }
877 877
878 void WebGraphicsContext3DImpl::shallowFinishCHROMIUM() { 878 void WebGraphicsContext3DImpl::shallowFinishCHROMIUM() {
879 flush_id_ = GenFlushID(); 879 flush_id_ = GenFlushID();
880 gl_->ShallowFinishCHROMIUM(); 880 gl_->ShallowFinishCHROMIUM();
881 } 881 }
882 882
883 DELEGATE_TO_GL_1(waitSyncPoint, WaitSyncPointCHROMIUM, GLuint) 883 DELEGATE_TO_GL_2(waitSyncPoint, WaitSyncPointCHROMIUM, GLuint, const WGC3Dbyte*)
884 884
885 void WebGraphicsContext3DImpl::loseContextCHROMIUM( 885 void WebGraphicsContext3DImpl::loseContextCHROMIUM(
886 WGC3Denum current, WGC3Denum other) { 886 WGC3Denum current, WGC3Denum other) {
887 gl_->LoseContextCHROMIUM(current, other); 887 gl_->LoseContextCHROMIUM(current, other);
888 gl_->Flush(); 888 gl_->Flush();
889 } 889 }
890 890
891 DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*) 891 DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*)
892 DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM, 892 DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM,
893 WGC3Denum, const WGC3Dbyte*) 893 WGC3Denum, const WGC3Dbyte*)
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 output_attribs->context_type = ::gpu::gles2::CONTEXT_TYPE_WEBGL2; 1270 output_attribs->context_type = ::gpu::gles2::CONTEXT_TYPE_WEBGL2;
1271 break; 1271 break;
1272 default: 1272 default:
1273 NOTREACHED(); 1273 NOTREACHED();
1274 output_attribs->context_type = ::gpu::gles2::CONTEXT_TYPE_OPENGLES2; 1274 output_attribs->context_type = ::gpu::gles2::CONTEXT_TYPE_OPENGLES2;
1275 break; 1275 break;
1276 } 1276 }
1277 } 1277 }
1278 1278
1279 } // namespace gpu_blink 1279 } // namespace gpu_blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698