diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 22:19:05 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 22:19:05 +0000 |
| commit | 74c8a07a137e5d79323c92dbe88c4dc1cddfc91f (patch) | |
| tree | c7c55cb83a908333a9064fab0c00589667a63853 /third_party | |
| parent | fd34812fcb7ede7bf2aed868f1a140f738040c52 (diff) | |
| download | chromium_src-74c8a07a137e5d79323c92dbe88c4dc1cddfc91f.zip chromium_src-74c8a07a137e5d79323c92dbe88c4dc1cddfc91f.tar.gz chromium_src-74c8a07a137e5d79323c92dbe88c4dc1cddfc91f.tar.bz2 | |
Revert 69472 - Suppress a spurious warning in CompareConfig
third_party/mesa/MesaLib/src/egl/main/eglconfig.c: In function _eglCompareConfigs:
third_party/mesa/MesaLib/src/egl/main/eglconfig.h:98: error: array subscript is below array bounds
BUG=None
TEST=manual/local, and a buildbot running an otherwise affected version.
Review URL: http://codereview.chromium.org/5866007
TBR=petermayo@chromium.org
Review URL: http://codereview.chromium.org/5925005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/mesa/MesaLib/src/egl/main/eglconfig.c | 14 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/third_party/mesa/MesaLib/src/egl/main/eglconfig.c b/third_party/mesa/MesaLib/src/egl/main/eglconfig.c index da94eea..1c97e42 100644 --- a/third_party/mesa/MesaLib/src/egl/main/eglconfig.c +++ b/third_party/mesa/MesaLib/src/egl/main/eglconfig.c @@ -601,19 +601,6 @@ _eglParseConfigAttribList(_EGLConfig *conf, const EGLint *attrib_list) * Note that EGL_NATIVE_VISUAL_TYPE is platform-dependent and is * ignored here. */ -/* - * Note that there is code that causes spurious array bounds warnings - * at the bottom of this function (gcc 4.4.1 and 4.4.3 -O2 + ...) - * GCC does not allow changing the warnings inside the function, but - * the combination of iterating over the array of attribs, calling - * GET_CONFIG_ATTRIB( , compare_attribs[i]) which calls _eglGetConfigKey - * which calls _eglGetConfigIdx to get the index into Storgae[] - * but the compiler loses track of the fact that all of the elements of - * compare_attribs don't cause it to return or use -1 as an index. - * Unrolling the loop is sufficient to eliminate the warnings, which puts - * high confidence in their spuriousness. - */ -#pragma GCC diagnostic ignored "-Warray-bounds" EGLint _eglCompareConfigs(const _EGLConfig *conf1, const _EGLConfig *conf2, const _EGLConfig *criteria, EGLBoolean compare_id) @@ -705,7 +692,6 @@ _eglCompareConfigs(const _EGLConfig *conf1, const _EGLConfig *conf2, return (val1 - val2); } -#pragma GCC diagnostic warning "-Warray-bounds" static INLINE diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index 04eddbb..c19eb9b 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -78,5 +78,3 @@ Later modifications (see chromium.patch): - Fixed compiler warning about cast to pointer from integer of different size in eglapi.c line 276. Replaced void* with EGLNativeDisplayType. - -- Suppressed spurious compiler warning from gcc in eglCompareConfig |