diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 15:51:00 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 15:51:00 +0000 |
| commit | 0ee1bcf7520d4cd4f3cfd9c4549209009e5d07c7 (patch) | |
| tree | caea3e3661acccaecf8004ec6869bf2666d97688 /third_party/mesa/MesaLib/src | |
| parent | c61fee2f41ca584ba4f48a2e41b9050147fd286e (diff) | |
| download | chromium_src-0ee1bcf7520d4cd4f3cfd9c4549209009e5d07c7.zip chromium_src-0ee1bcf7520d4cd4f3cfd9c4549209009e5d07c7.tar.gz chromium_src-0ee1bcf7520d4cd4f3cfd9c4549209009e5d07c7.tar.bz2 | |
Hotfix compilation of prog_parameter.c
BUG=142316
TBR=kbr
Review URL: https://chromiumcodereview.appspot.com/10834292
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa/MesaLib/src')
| -rw-r--r-- | third_party/mesa/MesaLib/src/mesa/program/prog_parameter.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/mesa/MesaLib/src/mesa/program/prog_parameter.c b/third_party/mesa/MesaLib/src/mesa/program/prog_parameter.c index 87de256..c563fd5 100644 --- a/third_party/mesa/MesaLib/src/mesa/program/prog_parameter.c +++ b/third_party/mesa/MesaLib/src/mesa/program/prog_parameter.c @@ -105,7 +105,10 @@ _mesa_free_parameter_list(struct gl_program_parameter_list *paramList) * \param state state indexes, or NULL * \return index of new parameter in the list, or -1 if error (out of mem) */ +#if defined(ADDRESS_SANITIZER) +// See http://crbug.com/142316. __attribute__((no_address_safety_analysis)) +#endif GLint _mesa_add_parameter(struct gl_program_parameter_list *paramList, gl_register_file type, const char *name, |