On Sat, Feb 23, 2013 at 7:26 AM, Brian Paul <bri...@vmware.com> wrote: > No longer needed. > --- > src/mesa/main/mfeatures.h | 53 > --------------------------------------------- > 1 files changed, 0 insertions(+), 53 deletions(-) > delete mode 100644 src/mesa/main/mfeatures.h > > diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h > deleted file mode 100644 > index 55e9cf9..0000000 > --- a/src/mesa/main/mfeatures.h > +++ /dev/null > @@ -1,53 +0,0 @@ > -/* > - * Mesa 3-D graphics library > - * Version: 7.1 > - * > - * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. > - * > - * Permission is hereby granted, free of charge, to any person obtaining a > - * copy of this software and associated documentation files (the "Software"), > - * to deal in the Software without restriction, including without limitation > - * the rights to use, copy, modify, merge, publish, distribute, sublicense, > - * and/or sell copies of the Software, and to permit persons to whom the > - * Software is furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included > - * in all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS > - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN > - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > - */ > - > - > -/** > - * \file mfeatures.h > - * Flags to enable/disable specific parts of the API. > - */ > - > -#ifndef FEATURES_H > -#define FEATURES_H > - > -#ifndef FEATURE_ES1 > -#define FEATURE_ES1 0 > -#endif > -#ifndef FEATURE_ES2 > -#define FEATURE_ES2 0 > -#endif > - > -#define FEATURE_ES (FEATURE_ES1 || FEATURE_ES2) > - > -#ifndef FEATURE_GL > -#define FEATURE_GL !FEATURE_ES > -#endif > - > -#if defined(IN_DRI_DRIVER) || (FEATURE_GL + FEATURE_ES1 + FEATURE_ES2 > 1) > -#define FEATURE_remap_table 1 > -#else > -#define FEATURE_remap_table 0 > -#endif > - > -#endif /* FEATURES_H */ > -- > 1.7.3.4
The series looks good to me. Have a Reviewed-by: Matt Turner <matts...@gmail.com> Also, I think the macro IN_DRI_DRIVER is now unused, so it should be removed from configure.ac and src/mesa/SConscript. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
