summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.