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

Side by Side Diff: webkit/gpu/webgraphicscontext3d_in_process_impl.cc

Issue 8460001: Expose gles2 bgra extensions when GL_EXT_bgra is supported (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/gpu/webgraphicscontext3d_in_process_impl.h" 5 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/string_split.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
17 #include "ui/gfx/gl/gl_bindings.h" 18 #include "ui/gfx/gl/gl_bindings.h"
18 #include "ui/gfx/gl/gl_bindings_skia_in_process.h" 19 #include "ui/gfx/gl/gl_bindings_skia_in_process.h"
19 #include "ui/gfx/gl/gl_context.h" 20 #include "ui/gfx/gl/gl_context.h"
20 #include "ui/gfx/gl/gl_implementation.h" 21 #include "ui/gfx/gl/gl_implementation.h"
21 #include "ui/gfx/gl/gl_surface.h" 22 #include "ui/gfx/gl/gl_surface.h"
22 23
(...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 WebString res = WebString::fromUTF8(log.get(), returned_log_length); 1241 WebString res = WebString::fromUTF8(log.get(), returned_log_length);
1241 return res; 1242 return res;
1242 } 1243 }
1243 1244
1244 WebString WebGraphicsContext3DInProcessImpl::getString(WGC3Denum name) { 1245 WebString WebGraphicsContext3DInProcessImpl::getString(WGC3Denum name) {
1245 makeContextCurrent(); 1246 makeContextCurrent();
1246 std::string result(reinterpret_cast<const char*>(glGetString(name))); 1247 std::string result(reinterpret_cast<const char*>(glGetString(name)));
1247 if (name == GL_EXTENSIONS) { 1248 if (name == GL_EXTENSIONS) {
1248 // GL_CHROMIUM_copy_texture_to_parent_texture requires the 1249 // GL_CHROMIUM_copy_texture_to_parent_texture requires the
1249 // desktopGL-only function glGetTexLevelParameteriv (GLES2 1250 // desktopGL-only function glGetTexLevelParameteriv (GLES2
1250 // doesn't support it). 1251 // doesn't support it).
Ken Russell (switch to Gerrit) 2011/11/04 01:18:58 Could you move this comment next to the addition o
piman 2011/11/04 01:36:30 Done.
1251 if (!is_gles2_) 1252 if (!is_gles2_) {
1253 std::vector<std::string> split;
1254 base::SplitString(result, ' ', &split);
1255 if (std::find(split.begin(), split.end(), "GL_EXT_bgra") != split.end()) {
1256 // If we support GL_EXT_bgra, pretend we support a couple of GLES2
1257 // extension that are a subset of it.
1258 result += " GL_EXT_texture_format_BGRA8888 GL_EXT_read_format_bgra";
1259 }
1252 result += " GL_CHROMIUM_copy_texture_to_parent_texture"; 1260 result += " GL_CHROMIUM_copy_texture_to_parent_texture";
1261 }
1253 } 1262 }
1254 return WebString::fromUTF8(result.c_str()); 1263 return WebString::fromUTF8(result.c_str());
1255 } 1264 }
1256 1265
1257 DELEGATE_TO_GL_3(getTexParameterfv, GetTexParameterfv, 1266 DELEGATE_TO_GL_3(getTexParameterfv, GetTexParameterfv,
1258 WGC3Denum, WGC3Denum, WGC3Dfloat*) 1267 WGC3Denum, WGC3Denum, WGC3Dfloat*)
1259 1268
1260 DELEGATE_TO_GL_3(getTexParameteriv, GetTexParameteriv, 1269 DELEGATE_TO_GL_3(getTexParameteriv, GetTexParameteriv,
1261 WGC3Denum, WGC3Denum, WGC3Dint*) 1270 WGC3Denum, WGC3Denum, WGC3Dint*)
1262 1271
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1675 if (length > 1) { 1684 if (length > 1) {
1676 entry->translated_source.reset(new char[length]); 1685 entry->translated_source.reset(new char[length]);
1677 ShGetObjectCode(compiler, entry->translated_source.get()); 1686 ShGetObjectCode(compiler, entry->translated_source.get());
1678 } 1687 }
1679 entry->is_valid = true; 1688 entry->is_valid = true;
1680 return true; 1689 return true;
1681 } 1690 }
1682 1691
1683 } // namespace gpu 1692 } // namespace gpu
1684 } // namespace webkit 1693 } // namespace webkit
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698