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

Unified Diff: webkit/gpu/webgraphicscontext3d_in_process_impl.cc

Issue 8772021: Enable GL_CHROMIUM_post_sub_buffer for osmesa (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/gl/gl_surface_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/gpu/webgraphicscontext3d_in_process_impl.cc
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
index 97e1c58374bd5c13b5551f1eb20f910f16045f90..7ce072f2f74f33804fa692a3c113770f78da43fd 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
@@ -1254,8 +1254,9 @@ WebString WebGraphicsContext3DInProcessImpl::getShaderSource(WebGLId shader) {
WebString WebGraphicsContext3DInProcessImpl::getString(WGC3Denum name) {
makeContextCurrent();
- std::string result(reinterpret_cast<const char*>(glGetString(name)));
+ std::string result;
if (name == GL_EXTENSIONS) {
+ result = gl_context_->GetExtensions();
if (!is_gles2_) {
std::vector<std::string> split;
base::SplitString(result, ' ', &split);
@@ -1265,6 +1266,8 @@ WebString WebGraphicsContext3DInProcessImpl::getString(WGC3Denum name) {
result += " GL_EXT_texture_format_BGRA8888 GL_EXT_read_format_bgra";
}
}
+ } else {
+ result = reinterpret_cast<const char*>(glGetString(name));
}
return WebString::fromUTF8(result.c_str());
}
« no previous file with comments | « ui/gfx/gl/gl_surface_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698