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

Side by Side Diff: webkit/common/gpu/webgraphicscontext3d_impl.cc

Issue 780653007: Added GL_CHROMIUM_trace_marker feature as well as gpu_toplevel markers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed endtrace calls Created 6 years 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 "webkit/common/gpu/webgraphicscontext3d_impl.h" 5 #include "webkit/common/gpu/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 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 WGC3Denum, 879 WGC3Denum,
880 WGC3Denum); 880 WGC3Denum);
881 DELEGATE_TO_GL_1(populateSubscribedValuesCHROMIUM, 881 DELEGATE_TO_GL_1(populateSubscribedValuesCHROMIUM,
882 PopulateSubscribedValuesCHROMIUM, 882 PopulateSubscribedValuesCHROMIUM,
883 WGC3Denum); 883 WGC3Denum);
884 DELEGATE_TO_GL_3(uniformValuebufferCHROMIUM, 884 DELEGATE_TO_GL_3(uniformValuebufferCHROMIUM,
885 UniformValuebufferCHROMIUM, 885 UniformValuebufferCHROMIUM,
886 WGC3Dint, 886 WGC3Dint,
887 WGC3Denum, 887 WGC3Denum,
888 WGC3Denum); 888 WGC3Denum);
889 DELEGATE_TO_GL_2(traceBeginCHROMIUM,
890 TraceBeginCHROMIUM,
891 const WGC3Dchar*,
892 const WGC3Dchar*);
893 DELEGATE_TO_GL(traceEndCHROMIUM, TraceEndCHROMIUM);
889 894
890 void WebGraphicsContext3DImpl::insertEventMarkerEXT( 895 void WebGraphicsContext3DImpl::insertEventMarkerEXT(
891 const WGC3Dchar* marker) { 896 const WGC3Dchar* marker) {
892 gl_->InsertEventMarkerEXT(0, marker); 897 gl_->InsertEventMarkerEXT(0, marker);
893 } 898 }
894 899
895 void WebGraphicsContext3DImpl::pushGroupMarkerEXT( 900 void WebGraphicsContext3DImpl::pushGroupMarkerEXT(
896 const WGC3Dchar* marker) { 901 const WGC3Dchar* marker) {
897 gl_->PushGroupMarkerEXT(0, marker); 902 gl_->PushGroupMarkerEXT(0, marker);
898 } 903 }
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 output_attribs->stencil_size = attributes.stencil ? 8 : 0; 1028 output_attribs->stencil_size = attributes.stencil ? 8 : 0;
1024 output_attribs->samples = attributes.antialias ? 4 : 0; 1029 output_attribs->samples = attributes.antialias ? 4 : 0;
1025 output_attribs->sample_buffers = attributes.antialias ? 1 : 0; 1030 output_attribs->sample_buffers = attributes.antialias ? 1 : 0;
1026 output_attribs->fail_if_major_perf_caveat = 1031 output_attribs->fail_if_major_perf_caveat =
1027 attributes.failIfMajorPerformanceCaveat; 1032 attributes.failIfMajorPerformanceCaveat;
1028 output_attribs->bind_generates_resource = false; 1033 output_attribs->bind_generates_resource = false;
1029 } 1034 }
1030 1035
1031 } // namespace gpu 1036 } // namespace gpu
1032 } // namespace webkit 1037 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698