summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-02 20:54:33 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-02 20:54:33 +0000
commite36ec510c871c78ea9b88f52e6f47b6503bcd4f1 (patch)
treee18fc9a0b8d0c6a87bab285a179959bf41f6502f
parent9b3b2b32710110b106ba3bb1e7913a399b33164a (diff)
downloadchromium_src-e36ec510c871c78ea9b88f52e6f47b6503bcd4f1.zip
chromium_src-e36ec510c871c78ea9b88f52e6f47b6503bcd4f1.tar.gz
chromium_src-e36ec510c871c78ea9b88f52e6f47b6503bcd4f1.tar.bz2
Roll mesa to 254411
TBR=timurrrr@chromium.org BUG=348397 Review URL: https://codereview.chromium.org/177293011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254416 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/mesa/README.chromium3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 53c2e90..eddbadf 100644
--- a/DEPS
+++ b/DEPS
@@ -291,7 +291,7 @@ deps = {
"/trunk/deps/cdm@249141",
"src/third_party/mesa/src":
- "/trunk/deps/third_party/mesa@252594",
+ "/trunk/deps/third_party/mesa@254411",
"src/third_party/cld_2/src":
(Var("googlecode_url") % "cld2") + "/trunk@84",
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium
index b9cd486..a4db4d8 100644
--- a/third_party/mesa/README.chromium
+++ b/third_party/mesa/README.chromium
@@ -41,3 +41,6 @@ Modifications made:
- #ifdef out inline definitions of math functions that are present in
VS2013's standard library.
+
+- #pragma optimize off around _swrast_write_zoomed_z_span, ICEing on
+ VS2013: http://crbug.com/348350.