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

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

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorprate review feedback, fix builds Created 6 years, 11 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 if (extensions.Contains("GL_EXT_texture_format_BGRA8888") || 394 if (extensions.Contains("GL_EXT_texture_format_BGRA8888") ||
395 extensions.Contains("GL_APPLE_texture_format_BGRA8888") || 395 extensions.Contains("GL_APPLE_texture_format_BGRA8888") ||
396 extensions.Contains("GL_EXT_bgra")) { 396 extensions.Contains("GL_EXT_bgra")) {
397 enable_texture_format_bgra8888 = true; 397 enable_texture_format_bgra8888 = true;
398 } 398 }
399 399
400 if (extensions.Contains("GL_EXT_bgra")) { 400 if (extensions.Contains("GL_EXT_bgra")) {
401 enable_render_buffer_bgra = true; 401 enable_render_buffer_bgra = true;
402 } 402 }
403 403
404 // XXX - using bgra textures blows up somewhere...
405 #if defined(USE_AURA) && defined(OS_MACOSX)
Ben Goodger (Google) 2014/01/06 17:37:10 who's the best person to review this? :-)
ccameron 2014/01/06 19:05:15 Oops! Removed this block & updated the CL descript
406 enable_texture_format_bgra8888 = false;
407 enable_render_buffer_bgra = false;
408 #endif
409
404 if (extensions.Contains("GL_EXT_read_format_bgra") || 410 if (extensions.Contains("GL_EXT_read_format_bgra") ||
405 extensions.Contains("GL_EXT_bgra")) { 411 extensions.Contains("GL_EXT_bgra")) {
406 enable_read_format_bgra = true; 412 enable_read_format_bgra = true;
407 } 413 }
408 414
409 if (enable_texture_format_bgra8888) { 415 if (enable_texture_format_bgra8888) {
410 feature_flags_.ext_texture_format_bgra8888 = true; 416 feature_flags_.ext_texture_format_bgra8888 = true;
411 AddExtensionString("GL_EXT_texture_format_BGRA8888"); 417 AddExtensionString("GL_EXT_texture_format_BGRA8888");
412 texture_format_validators_[GL_BGRA_EXT].AddValue(GL_UNSIGNED_BYTE); 418 texture_format_validators_[GL_BGRA_EXT].AddValue(GL_UNSIGNED_BYTE);
413 validators_.texture_internal_format.AddValue(GL_BGRA_EXT); 419 validators_.texture_internal_format.AddValue(GL_BGRA_EXT);
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 if (extensions_.find(str) == std::string::npos) { 735 if (extensions_.find(str) == std::string::npos) {
730 extensions_ += (extensions_.empty() ? "" : " ") + str; 736 extensions_ += (extensions_.empty() ? "" : " ") + str;
731 } 737 }
732 } 738 }
733 739
734 FeatureInfo::~FeatureInfo() { 740 FeatureInfo::~FeatureInfo() {
735 } 741 }
736 742
737 } // namespace gles2 743 } // namespace gles2
738 } // namespace gpu 744 } // namespace gpu
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | ui/aura/aura.gyp » ('j') | ui/aura/env.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698