Skip to content

Commit

Permalink
Upgraded Mesa to 7.9 from 7.7 in order to pick up bug fixes to the
Browse files Browse the repository at this point in the history
shader compiler which were causing WebGL test timeouts per
https://bugs.webkit.org/show_bug.cgi?id=47243 . Version 7.8.2 was too
buggy to use.

This upgrade required the incorporation of the talloc library, which
is only compiled in to the OSMesa shared object produced by
third_party/mesa/mesa.gyp and not into the rest of Chromium.

Upgraded mesa.gyp for the new source directories and files in Mesa
7.9. Applied the changes originally documented in
third_party/mesa/README.chromium to the 7.9 sources. Made other
necessary changes to Mesa and talloc to be able to build and run them
on Windows and Mac OS X. Created chromium.patch files for both Mesa
and talloc.

Fixed chrome/gpu/gpu_main.cc to honor the --use-gl command line option
on Linux.

Tested on Linux in Chromium with CSS 3D content and --use-gl=osmesa as
well as in DumpRenderTree and verified that the affected WebGL tests
no longer hang. Tested on Windows in Chromium with WebGL content and
--use-gl=osmesa. Tested on Mac OS X in test_shell with WebGL content.
This job was explicitly not sent to the try bots because it would
probably kill them.

The files in this CL are a small subset of the files being committed.
The patch is too large to upload to Rietveld.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/4107001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63795 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
kbr@chromium.org committed Oct 25, 2010
1 parent 86a5293 commit 1a7f66e
Show file tree
Hide file tree
Showing 3,534 changed files with 527,712 additions and 305,297 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 4 additions & 1 deletion chrome/gpu/gpu_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "app/app_switches.h"
#include "app/gfx/gl/gl_implementation.h"
#include "base/message_loop.h"
#include "build/build_config.h"
Expand Down Expand Up @@ -66,7 +67,9 @@ int GpuMain(const MainFunctionParams& parameters) {
#if defined(OS_WIN)
win_util::ScopedCOMInitializer com_initializer;
#elif defined(GPU_USE_GLX)
gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
if (!command_line.HasSwitch(switches::kUseGL)) {
gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
}
#endif

GpuProcess gpu_process;
Expand Down
Loading

0 comments on commit 1a7f66e

Please sign in to comment.