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

Side by Side Diff: gpu/command_buffer/service/feature_info.cc

Issue 10078006: Revert 132934 - this change seems to break many webgl related layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months 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 | Annotate | Revision Log
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/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "gpu/command_buffer/service/gl_utils.h" 10 #include "gpu/command_buffer/service/gl_utils.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 AddExtensionString("GL_CHROMIUM_resource_safe"); 114 AddExtensionString("GL_CHROMIUM_resource_safe");
115 AddExtensionString("GL_CHROMIUM_resize"); 115 AddExtensionString("GL_CHROMIUM_resize");
116 AddExtensionString("GL_CHROMIUM_strict_attribs"); 116 AddExtensionString("GL_CHROMIUM_strict_attribs");
117 AddExtensionString("GL_CHROMIUM_swapbuffers_complete_callback"); 117 AddExtensionString("GL_CHROMIUM_swapbuffers_complete_callback");
118 AddExtensionString("GL_CHROMIUM_rate_limit_offscreen_context"); 118 AddExtensionString("GL_CHROMIUM_rate_limit_offscreen_context");
119 AddExtensionString("GL_CHROMIUM_set_visibility"); 119 AddExtensionString("GL_CHROMIUM_set_visibility");
120 AddExtensionString("GL_CHROMIUM_gpu_memory_manager"); 120 AddExtensionString("GL_CHROMIUM_gpu_memory_manager");
121 AddExtensionString("GL_CHROMIUM_discard_framebuffer"); 121 AddExtensionString("GL_CHROMIUM_discard_framebuffer");
122 AddExtensionString("GL_CHROMIUM_command_buffer_query"); 122 AddExtensionString("GL_CHROMIUM_command_buffer_query");
123 AddExtensionString("GL_CHROMIUM_copy_texture");
124 AddExtensionString("GL_ANGLE_translated_shader_source"); 123 AddExtensionString("GL_ANGLE_translated_shader_source");
125 124
126 if (ext.Have("GL_ANGLE_translated_shader_source")) { 125 if (ext.Have("GL_ANGLE_translated_shader_source")) {
127 feature_flags_.angle_translated_shader_source = true; 126 feature_flags_.angle_translated_shader_source = true;
128 } 127 }
129 128
130 // Only turn this feature on if it is requested. Not by default. 129 // Only turn this feature on if it is requested. Not by default.
131 if (desired_features && ext.Desire("GL_CHROMIUM_webglsl")) { 130 if (desired_features && ext.Desire("GL_CHROMIUM_webglsl")) {
132 AddExtensionString("GL_CHROMIUM_webglsl"); 131 AddExtensionString("GL_CHROMIUM_webglsl");
133 feature_flags_.chromium_webglsl = true; 132 feature_flags_.chromium_webglsl = true;
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 } 464 }
466 465
467 void FeatureInfo::AddExtensionString(const std::string& str) { 466 void FeatureInfo::AddExtensionString(const std::string& str) {
468 if (extensions_.find(str) == std::string::npos) { 467 if (extensions_.find(str) == std::string::npos) {
469 extensions_ += (extensions_.empty() ? "" : " ") + str; 468 extensions_ += (extensions_.empty() ? "" : " ") + str;
470 } 469 }
471 } 470 }
472 471
473 } // namespace gles2 472 } // namespace gles2
474 } // namespace gpu 473 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('k') | gpu/command_buffer/service/gl_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698