diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-25 22:47:51 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-25 22:47:51 +0000 |
| commit | 1a7f66eb16724be2fe195ed62141b86dd63168b1 (patch) | |
| tree | 8aaeced09377f3633977787a63f7f1998100bbb8 /third_party/talloc/build_macros.m4 | |
| parent | 86a5293ac4571cffb0c7bb7f2da50f91ce6db829 (diff) | |
| download | chromium_src-1a7f66eb16724be2fe195ed62141b86dd63168b1.zip chromium_src-1a7f66eb16724be2fe195ed62141b86dd63168b1.tar.gz chromium_src-1a7f66eb16724be2fe195ed62141b86dd63168b1.tar.bz2 | |
Upgraded Mesa to 7.9 from 7.7 in order to pick up bug fixes to the
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
Diffstat (limited to 'third_party/talloc/build_macros.m4')
| -rw-r--r-- | third_party/talloc/build_macros.m4 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/third_party/talloc/build_macros.m4 b/third_party/talloc/build_macros.m4 new file mode 100644 index 0000000..c036668 --- /dev/null +++ b/third_party/talloc/build_macros.m4 @@ -0,0 +1,14 @@ +AC_DEFUN(BUILD_WITH_SHARED_BUILD_DIR, + [ AC_ARG_WITH([shared-build-dir], + [AC_HELP_STRING([--with-shared-build-dir=DIR], + [temporary build directory where libraries are installed [$srcdir/sharedbuild]])]) + + sharedbuilddir="$srcdir/sharedbuild" + if test x"$with_shared_build_dir" != x; then + sharedbuilddir=$with_shared_build_dir + CFLAGS="$CFLAGS -I$with_shared_build_dir/include" + LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib" + fi + AC_SUBST(sharedbuilddir) + ]) + |