Module Name: xsrc
Committed By: riastradh
Date: Fri Feb 26 18:29:59 UTC 2016
Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen:
nv50_ir.h nv50_ir_lowering_nvc0.cpp nv50_ir_lowering_nvc0.h
nv50_ir_ra.cpp
Log Message:
Use -std=c++11 unordered_set, not TR1 unordered_set.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir.h \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
\
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h
\
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir.h
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir.h:1.1.1.1 Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir.h Fri Feb 26 18:29:59 2016
@@ -29,7 +29,7 @@
#include <deque>
#include <list>
#include <vector>
-#include <tr1/unordered_set>
+#include <unordered_set>
#include "codegen/nv50_ir_util.h"
#include "codegen/nv50_ir_graph.h"
@@ -582,10 +582,10 @@ public:
static inline Value *get(Iterator&);
- std::tr1::unordered_set<ValueRef *> uses;
+ std::unordered_set<ValueRef *> uses;
std::list<ValueDef *> defs;
- typedef std::tr1::unordered_set<ValueRef *>::iterator UseIterator;
- typedef std::tr1::unordered_set<ValueRef *>::const_iterator UseCIterator;
+ typedef std::unordered_set<ValueRef *>::iterator UseIterator;
+ typedef std::unordered_set<ValueRef *>::const_iterator UseCIterator;
typedef std::list<ValueDef *>::iterator DefIterator;
typedef std::list<ValueDef *>::const_iterator DefCIterator;
Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp:1.1.1.1 Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp Fri Feb 26 18:29:59 2016
@@ -178,7 +178,7 @@ NVC0LegalizePostRA::findFirstUses(
const Instruction *texi,
const Instruction *insn,
std::list<TexUse> &uses,
- std::tr1::unordered_set<const Instruction *>& visited)
+ std::unordered_set<const Instruction *>& visited)
{
for (int d = 0; insn->defExists(d); ++d) {
Value *v = insn->getDef(d);
@@ -272,7 +272,7 @@ NVC0LegalizePostRA::insertTextureBarrier
if (!uses)
return false;
for (size_t i = 0; i < texes.size(); ++i) {
- std::tr1::unordered_set<const Instruction *> visited;
+ std::unordered_set<const Instruction *> visited;
findFirstUses(texes[i], texes[i], uses[i], visited);
}
Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h:1.1.1.1 Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h Fri Feb 26 18:29:59 2016
@@ -20,7 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <tr1/unordered_set>
+#include <unordered_set>
#include "codegen/nv50_ir.h"
#include "codegen/nv50_ir_build_util.h"
@@ -72,7 +72,7 @@ private:
inline bool insnDominatedBy(const Instruction *, const Instruction *) const;
void findFirstUses(const Instruction *tex, const Instruction *def,
std::list<TexUse>&,
- std::tr1::unordered_set<const Instruction *>&);
+ std::unordered_set<const Instruction *>&);
void findOverwritingDefs(const Instruction *tex, Instruction *insn,
const BasicBlock *term,
std::list<TexUse>&);
Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp:1.1.1.1 Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp Fri Feb 26 18:29:59 2016
@@ -25,7 +25,7 @@
#include <stack>
#include <limits>
-#include <tr1/unordered_set>
+#include <unordered_set>
namespace nv50_ir {
@@ -1551,7 +1551,7 @@ SpillCodeInserter::run(const std::list<V
// Keep track of which instructions to delete later. Deleting them
// inside the loop is unsafe since a single instruction may have
// multiple destinations that all need to be spilled (like OP_SPLIT).
- std::tr1::unordered_set<Instruction *> to_del;
+ std::unordered_set<Instruction *> to_del;
for (Value::DefIterator d = lval->defs.begin(); d != lval->defs.end();
++d) {
@@ -1593,7 +1593,7 @@ SpillCodeInserter::run(const std::list<V
}
}
- for (std::tr1::unordered_set<Instruction *>::const_iterator it = to_del.begin();
+ for (std::unordered_set<Instruction *>::const_iterator it = to_del.begin();
it != to_del.end(); ++it)
delete_Instruction(func->getProgram(), *it);
}
