diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 20:21:45 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 20:21:45 +0000 |
| commit | 757b830b69910baf5942814c5107878a2e2e5392 (patch) | |
| tree | cfd007cb740b869797897234705bb23e54fe2cdb /third_party/mesa | |
| parent | c972de4dab685cad3a910792f9537d8ff18c973c (diff) | |
| download | chromium_src-757b830b69910baf5942814c5107878a2e2e5392.zip chromium_src-757b830b69910baf5942814c5107878a2e2e5392.tar.gz chromium_src-757b830b69910baf5942814c5107878a2e2e5392.tar.bz2 | |
Disable optimization for s_texcombine.c because it takes
~20 minutes to build on Chromium XP.
Review URL: http://codereview.chromium.org/2460002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c | 4 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c b/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c index 889164b..85a2c48 100644 --- a/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c +++ b/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c @@ -23,7 +23,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - #include "main/glheader.h" #include "main/context.h" #include "main/colormac.h" @@ -35,6 +34,9 @@ #include "s_context.h" #include "s_texcombine.h" +#if defined(_MSC_VER) +#pragma optimize("", off) +#endif /** * Pointer to array of float[4] diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index f98b2e6..bd7d07c 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -17,3 +17,5 @@ Modifications made with initial commit: Later modifications:
- Added OSMesaGetProcAddress to MesaLib/src/mesa/drivers/osmesa/osmesa.def
+
+- Added #pragma optimize('', off) to MesaLib\src\mesa\swrast\s_textcombine.c
|