fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 02:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau: drop Android 4.4 and earlier support

Browse source 
Support for Android 4.4 and earlier has already been removed from mesa.
Remove this remaining piece from nouveau, too.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Rob Herring 2017-05-23 13:58:24 -05:00
parent 0dabb9d9fa
commit 151bd66080
2 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
View file

@ -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

32
src/gallium/drivers/nouveau/codegen/unordered_set.h
View file

@ -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