diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 15:45:17 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 15:45:17 +0000 |
| commit | 1b6b676e43be7e4d8bce87fa2b3e136477d4a899 (patch) | |
| tree | 7bee9dea51993505208561dee52398bad898ff17 /third_party | |
| parent | 9812632e220e0895064d6897fa59077c535d92f7 (diff) | |
| download | chromium_src-1b6b676e43be7e4d8bce87fa2b3e136477d4a899.zip chromium_src-1b6b676e43be7e4d8bce87fa2b3e136477d4a899.tar.gz chromium_src-1b6b676e43be7e4d8bce87fa2b3e136477d4a899.tar.bz2 | |
Enable -Wself-assign-memvar for Mesa, merge upstream fix for the one violation
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10808045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/mesa/MesaLib/src/glsl/ir.h | 4 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/mesa/mesa.gyp | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/third_party/mesa/MesaLib/src/glsl/ir.h b/third_party/mesa/MesaLib/src/glsl/ir.h index fa246b5..5aa7c6d 100644 --- a/third_party/mesa/MesaLib/src/glsl/ir.h +++ b/third_party/mesa/MesaLib/src/glsl/ir.h @@ -989,7 +989,6 @@ public: { this->ir_type = ir_type_loop_jump; this->mode = mode; - this->loop = loop; } virtual ir_loop_jump *clone(void *mem_ctx, struct hash_table *) const; @@ -1013,9 +1012,6 @@ public: /** Mode selector for the jump instruction. */ enum jump_mode mode; -private: - /** Loop containing this break instruction. */ - ir_loop *loop; }; /** diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index 8dbf1bb..435f60e 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -95,3 +95,6 @@ Later modifications (see chromium.patch): from gl_apinop.c. http://code.google.com/p/chromium/issues/detail?id=92568 https://bugs.freedesktop.org/show_bug.cgi?id=40028 + +- Merged fix for https://bugs.freedesktop.org/show_bug.cgi?id=51574 + (commit b1802a2115323233352da558430e109ff187b8af) diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index d1cb6bd..1ed392c 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -526,14 +526,11 @@ # texenvprogram.c converts '~0' to a bitfield, which causes clang # to warn that -1 is implicitly converted to 255. '-Wno-constant-conversion', - # https://bugs.freedesktop.org/show_bug.cgi?id=51574 - '-Wno-self-assign-memvar', ], }, 'cflags': [ '-Wno-unused-value', '-Wno-constant-conversion', - '-Wno-self-assign-memvar', ], }], ], |