diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 05:45:20 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 05:45:20 +0000 |
| commit | 4ba6f50a5bc78554a4108750a342c2b5b6b99e73 (patch) | |
| tree | 4ca2e318b60c55965588c18a48dd1744728b08eb | |
| parent | f2ba7591b1407a7ee9209f842c50696914dc2ded (diff) | |
| download | src-4ba6f50a5bc78554a4108750a342c2b5b6b99e73.tar.gz | |
Disabled optimizations for a few files when compiled with Visual
Studio due to the compiler taking an unreasonably long time.
This patch should be upstreamed to the Mesa tree.
BUG=238755
TBR=marcheu@chromium.org
Review URL: https://codereview.chromium.org/16951009
git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206311 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | src/mesa/main/mipmap.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/pack.c | 4 | ||||
| -rw-r--r-- | src/mesa/math/m_eval.c | 9 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texcombine.c | 8 |
4 files changed, 27 insertions, 3 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 15373ba..65f339a 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -40,7 +40,14 @@ #include "../../gallium/auxiliary/util/u_format_rgb9e5.h" #include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" - +/* + * XXX: MSVC takes forever to compile this module for x86 unless we disable + * optimizations. + * + */ +#if defined(_MSC_VER) && defined(_M_IX86) +# pragma optimize( "", off ) +#endif static GLint bytes_per_pixel(GLenum datatype, GLuint comps) diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index 4c99199..34f0823 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -30,14 +30,14 @@ /* - * XXX: MSVC takes forever to compile this module for x86_64 unless we disable + * XXX: MSVC takes forever to compile this module unless we disable * this global optimization. * * See also: * - http://msdn.microsoft.com/en-us/library/1yk3ydd7.aspx * - http://msdn.microsoft.com/en-us/library/chh3fb0k.aspx */ -#if defined(_MSC_VER) && defined(_M_X64) +#if defined(_MSC_VER) # pragma optimize( "g", off ) #endif diff --git a/src/mesa/math/m_eval.c b/src/mesa/math/m_eval.c index d324673..4a461de 100644 --- a/src/mesa/math/m_eval.c +++ b/src/mesa/math/m_eval.c @@ -41,6 +41,15 @@ #include "main/config.h" #include "m_eval.h" +/* + * XXX: MSVC takes forever to compile this module for x86 unless we disable + * optimizations. + * + */ +#if defined(_MSC_VER) && defined(_M_IX86) +# pragma optimize( "", off ) +#endif + static GLfloat inv_tab[MAX_EVAL_ORDER]; diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 2a32361..2b971bb 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/src/mesa/swrast/s_texcombine.c @@ -35,6 +35,14 @@ #include "s_context.h" #include "s_texcombine.h" +/* + * XXX: MSVC takes forever to compile this module for x86 unless we disable + * optimizations. + * + */ +#if defined(_MSC_VER) && defined(_M_IX86) +# pragma optimize( "", off ) +#endif /** * Pointer to array of float[4] |