diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 18:27:27 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 18:27:27 +0000 |
| commit | 4297bea874c5620b111cd07bb06bd4e256e7e72b (patch) | |
| tree | 0b934b27d12098ea9bf28c1ffaee7cbd71b86464 /webkit | |
| parent | f8530b797730cca270210117a949a4a06be4009d (diff) | |
| download | chromium_src-4297bea874c5620b111cd07bb06bd4e256e7e72b.zip chromium_src-4297bea874c5620b111cd07bb06bd4e256e7e72b.tar.gz chromium_src-4297bea874c5620b111cd07bb06bd4e256e7e72b.tar.bz2 | |
Enable GL_CHROMIUM_post_sub_buffer for osmesa
Small changes to WGC3DInProcessImpl to pass the extension up to WebKit.
BUG=none
TEST=with https://bugs.webkit.org/show_bug.cgi?id=67341 and --use-gl=osmesa
Review URL: http://codereview.chromium.org/8772021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index 97e1c58..7ce072f 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()); } |