From 1911b23bf5a463d2f2de6618f7aac9247309e8f5 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Sat, 23 Oct 2010 17:25:00 +0000 Subject: [PATCH] WebGL performance with osmesa is unusably slow. Disable WebGL support until a working desktop or egl implementation is available. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@124 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef.gyp | 2 -- libcef/browser_webkit_init.h | 2 +- libcef/cef_process_ui_thread.cc | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cef.gyp b/cef.gyp index 91ce3254f..777f8d614 100644 --- a/cef.gyp +++ b/cef.gyp @@ -160,7 +160,6 @@ '../third_party/libpng/libpng.gyp:libpng', '../third_party/libxml/libxml.gyp:libxml', '../third_party/libxslt/libxslt.gyp:libxslt', - '../third_party/mesa/mesa.gyp:osmesa', '../third_party/modp_b64/modp_b64.gyp:modp_b64', '../third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:pcre', '../third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', @@ -354,7 +353,6 @@ '../third_party/libpng/libpng.gyp:libpng', '../third_party/libxml/libxml.gyp:libxml', '../third_party/libxslt/libxslt.gyp:libxslt', - '../third_party/mesa/mesa.gyp:osmesa', '../third_party/modp_b64/modp_b64.gyp:modp_b64', '../third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:pcre', '../third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', diff --git a/libcef/browser_webkit_init.h b/libcef/browser_webkit_init.h index 3622d20a2..2b0110cb5 100644 --- a/libcef/browser_webkit_init.h +++ b/libcef/browser_webkit_init.h @@ -55,7 +55,7 @@ class BrowserWebKitInit : public webkit_glue::WebKitClientImpl { WebKit::WebRuntimeFeatures::enableSockets(true); WebKit::WebRuntimeFeatures::enableApplicationCache(true); WebKit::WebRuntimeFeatures::enableDatabase(true); - WebKit::WebRuntimeFeatures::enableWebGL(true); + WebKit::WebRuntimeFeatures::enableWebGL(false); WebKit::WebRuntimeFeatures::enablePushState(true); WebKit::WebRuntimeFeatures::enableNotifications(true); WebKit::WebRuntimeFeatures::enableTouch(true); diff --git a/libcef/cef_process_ui_thread.cc b/libcef/cef_process_ui_thread.cc index a9b84c492..dd033bbbb 100644 --- a/libcef/cef_process_ui_thread.cc +++ b/libcef/cef_process_ui_thread.cc @@ -147,7 +147,7 @@ void CefProcessUIThread::Init() { net::SSLClientSocketNSSFactory); #endif - gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); + gfx::InitializeGLBindings(gfx::kGLImplementationNone); URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory); }