Module: Mesa Branch: master Commit: 151bd66080541d55c497145336d23cde4429f504 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=151bd66080541d55c497145336d23cde4429f504
Author: Rob Herring <r...@kernel.org> Date: Tue May 23 13:58:24 2017 -0500 nouveau: drop Android 4.4 and earlier support Support for Android 4.4 and earlier has already been removed from mesa. Remove this remaining piece from nouveau, too. Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Signed-off-by: Rob Herring <r...@kernel.org> --- src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 4 +-- .../drivers/nouveau/codegen/unordered_set.h | 32 ++-------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp index 193628cfbd..b33d7b4010 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp @@ -37,11 +37,9 @@ namespace nv50_ir { #if __cplusplus >= 201103L using std::hash; using std::unordered_map; -#elif !defined(ANDROID) +#else using std::tr1::hash; using std::tr1::unordered_map; -#else -#error Android release before Lollipop is not supported! #endif #define MAX_REGISTER_FILE_SIZE 256 diff --git a/src/gallium/drivers/nouveau/codegen/unordered_set.h b/src/gallium/drivers/nouveau/codegen/unordered_set.h index 8ef6d462ff..0e2945f666 100644 --- a/src/gallium/drivers/nouveau/codegen/unordered_set.h +++ b/src/gallium/drivers/nouveau/codegen/unordered_set.h @@ -1,7 +1,7 @@ #ifndef __NV50_UNORDERED_SET_H__ #define __NV50_UNORDERED_SET_H__ -#if (__cplusplus >= 201103L) || defined(ANDROID) +#if (__cplusplus >= 201103L) #include <unordered_set> #else #include <tr1/unordered_set> @@ -11,36 +11,8 @@ namespace nv50_ir { #if __cplusplus >= 201103L using std::unordered_set; -#elif !defined(ANDROID) +#else using std::tr1::unordered_set; -#else // Android release before lollipop -using std::isfinite; -typedef std::tr1::unordered_set<void *> voidptr_unordered_set; - -template <typename V> -class unordered_set : public voidptr_unordered_set { - public: - typedef voidptr_unordered_set _base; - typedef _base::iterator _biterator; - typedef _base::const_iterator const_biterator; - - class iterator : public _biterator { - public: - iterator(const _biterator & i) : _biterator(i) {} - V operator*() const { return reinterpret_cast<V>(*_biterator(*this)); } - }; - class const_iterator : public const_biterator { - public: - const_iterator(const iterator & i) : const_biterator(i) {} - const_iterator(const const_biterator & i) : const_biterator(i) {} - const V operator*() const { return reinterpret_cast<const V>(*const_biterator(*this)); } - }; - - iterator begin() { return _base::begin(); } - iterator end() { return _base::end(); } - const_iterator begin() const { return _base::begin(); } - const_iterator end() const { return _base::end(); } -}; #endif } // namespace nv50_ir _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit