diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:28:04 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:28:04 +0000 |
| commit | 35011c75172bd9085890021da04027925b09addd (patch) | |
| tree | e6cf0a51c66a1cb5cde6aaa96369f99a617a98d5 /third_party/mesa/MesaLib/src | |
| parent | fbe4f18427a9ac0b759bed46b6b31b215de46242 (diff) | |
| download | chromium_src-35011c75172bd9085890021da04027925b09addd.zip chromium_src-35011c75172bd9085890021da04027925b09addd.tar.gz chromium_src-35011c75172bd9085890021da04027925b09addd.tar.bz2 | |
Re-add disabling of optimization in s_texcombine.c on Windows lost
during Mesa 7.9 upgrade. Also necessarily disabled optimizations in
src/mesa/main/image.c, src/mesa/main/mipmap.c,
src/mesa/main/histogram.c, and src/mesa/math/m_eval.c. Updated
README.chromium and chromium.patch.
BUG=none
TEST=none (built Mesa in Release mode on Windows)
Review URL: http://codereview.chromium.org/4137004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa/MesaLib/src')
5 files changed, 16 insertions, 1 deletions
diff --git a/third_party/mesa/MesaLib/src/mesa/main/histogram.c b/third_party/mesa/MesaLib/src/mesa/main/histogram.c index 4e482bc..a2bd88e 100644 --- a/third_party/mesa/MesaLib/src/mesa/main/histogram.c +++ b/third_party/mesa/MesaLib/src/mesa/main/histogram.c @@ -32,6 +32,9 @@ #include "macros.h" #include "main/dispatch.h" +#if defined(_MSC_VER) +#pragma optimize("", off) +#endif #if FEATURE_histogram diff --git a/third_party/mesa/MesaLib/src/mesa/main/image.c b/third_party/mesa/MesaLib/src/mesa/main/image.c index 86aa6d0..4aa30fe 100644 --- a/third_party/mesa/MesaLib/src/mesa/main/image.c +++ b/third_party/mesa/MesaLib/src/mesa/main/image.c @@ -37,6 +37,9 @@ #include "imports.h" #include "macros.h" +#if defined(_MSC_VER) +#pragma optimize("", off) +#endif /** * NOTE: diff --git a/third_party/mesa/MesaLib/src/mesa/main/mipmap.c b/third_party/mesa/MesaLib/src/mesa/main/mipmap.c index 3d1a4c4..c731fd0 100644 --- a/third_party/mesa/MesaLib/src/mesa/main/mipmap.c +++ b/third_party/mesa/MesaLib/src/mesa/main/mipmap.c @@ -34,7 +34,9 @@ #include "texstore.h" #include "image.h" - +#if defined(_MSC_VER) +#pragma optimize("", off) +#endif static GLint bytes_per_pixel(GLenum datatype, GLuint comps) diff --git a/third_party/mesa/MesaLib/src/mesa/math/m_eval.c b/third_party/mesa/MesaLib/src/mesa/math/m_eval.c index d324673..636f7b2 100644 --- a/third_party/mesa/MesaLib/src/mesa/math/m_eval.c +++ b/third_party/mesa/MesaLib/src/mesa/math/m_eval.c @@ -41,6 +41,10 @@ #include "main/config.h" #include "m_eval.h" +#if defined(_MSC_VER) +#pragma optimize("", off) +#endif + static GLfloat inv_tab[MAX_EVAL_ORDER]; 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 2ac0aaa..f395de3e 100644 --- a/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c +++ b/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c @@ -34,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] |