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

Side by Side Diff: gpu/command_buffer/service/feature_info.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 "gpu/command_buffer/service/feature_info.h" 5 #include "gpu/command_buffer/service/feature_info.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 AddExtensionString("GL_CHROMIUM_command_buffer_latency_query"); 282 AddExtensionString("GL_CHROMIUM_command_buffer_latency_query");
283 AddExtensionString("GL_CHROMIUM_copy_texture"); 283 AddExtensionString("GL_CHROMIUM_copy_texture");
284 AddExtensionString("GL_CHROMIUM_get_error_query"); 284 AddExtensionString("GL_CHROMIUM_get_error_query");
285 AddExtensionString("GL_CHROMIUM_lose_context"); 285 AddExtensionString("GL_CHROMIUM_lose_context");
286 AddExtensionString("GL_CHROMIUM_pixel_transfer_buffer_object"); 286 AddExtensionString("GL_CHROMIUM_pixel_transfer_buffer_object");
287 AddExtensionString("GL_CHROMIUM_rate_limit_offscreen_context"); 287 AddExtensionString("GL_CHROMIUM_rate_limit_offscreen_context");
288 AddExtensionString("GL_CHROMIUM_resize"); 288 AddExtensionString("GL_CHROMIUM_resize");
289 AddExtensionString("GL_CHROMIUM_resource_safe"); 289 AddExtensionString("GL_CHROMIUM_resource_safe");
290 AddExtensionString("GL_CHROMIUM_strict_attribs"); 290 AddExtensionString("GL_CHROMIUM_strict_attribs");
291 AddExtensionString("GL_CHROMIUM_texture_mailbox"); 291 AddExtensionString("GL_CHROMIUM_texture_mailbox");
292 AddExtensionString("GL_CHROMIUM_trace_marker");
292 AddExtensionString("GL_EXT_debug_marker"); 293 AddExtensionString("GL_EXT_debug_marker");
293 294
294 if (feature_flags_.enable_subscribe_uniform) { 295 if (feature_flags_.enable_subscribe_uniform) {
295 AddExtensionString("GL_CHROMIUM_subscribe_uniform"); 296 AddExtensionString("GL_CHROMIUM_subscribe_uniform");
296 } 297 }
297 298
298 // OES_vertex_array_object is emulated if not present natively, 299 // OES_vertex_array_object is emulated if not present natively,
299 // so the extension string is always exposed. 300 // so the extension string is always exposed.
300 AddExtensionString("GL_OES_vertex_array_object"); 301 AddExtensionString("GL_OES_vertex_array_object");
301 302
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 if (pos == std::string::npos) { 1034 if (pos == std::string::npos) {
1034 extensions_ += (extensions_.empty() ? "" : " ") + str; 1035 extensions_ += (extensions_.empty() ? "" : " ") + str;
1035 } 1036 }
1036 } 1037 }
1037 1038
1038 FeatureInfo::~FeatureInfo() { 1039 FeatureInfo::~FeatureInfo() {
1039 } 1040 }
1040 1041
1041 } // namespace gles2 1042 } // namespace gles2
1042 } // namespace gpu 1043 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698