diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-02 21:04:21 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-02 21:04:21 +0000 |
| commit | 5bdd20038b4bacce9c306d03ca9995cd6ceda97d (patch) | |
| tree | 01789b97c407ebc19a7be71430f031e232b06086 | |
| parent | 4da7aee27669e21e727d892b753a0e8cad6c5ac3 (diff) | |
| parent | 3f79f50967bbf4fdaba7507a8d1526aa24eefd91 (diff) | |
| download | src-5bdd20038b4bacce9c306d03ca9995cd6ceda97d.tar.gz | |
Merge third_party/mesa/src from https://chromium.googlesource.com/chromium/deps/mesa.git at 3f79f50967bbf4fdaba7507a8d1526aa24eefd91
This commit was generated by merge_from_chromium.py.
Change-Id: I872dc772b10b6bf7fb41bc2f4ff8f66116f2ce88
| -rw-r--r-- | src/mesa/swrast/s_zoom.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c index 768bbba..cf9feb8 100644 --- a/src/mesa/swrast/s_zoom.c +++ b/src/mesa/swrast/s_zoom.c @@ -395,6 +395,10 @@ _swrast_write_zoomed_stencil_span(struct gl_context *ctx, GLint imgX, GLint imgY free(zoomedVals); } +// http://crbug.com/348397 +#ifdef _MSC_VER +#pragma optimize("", off) +#endif /** * Zoom/write 32-bit Z values. @@ -440,3 +444,7 @@ _swrast_write_zoomed_z_span(struct gl_context *ctx, GLint imgX, GLint imgY, free(zoomedVals); } + +#ifdef _MSC_VER +#pragma optimize("", off) +#endif |