drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge error.

Browse Source
This commit is contained in:
castano 2012-02-02 16:21:48 +00:00
parent 8922ab86d6
commit d08c9e61e3
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvtt/TaskDispatcher.h
View File

@ -18,8 +18,7 @@
// http://msdn.microsoft.com/en-us/library/dd504870.aspx // http://msdn.microsoft.com/en-us/library/dd504870.aspx
#if NV_OS_WIN32 && _MSC_VER >= 1600 #if NV_OS_WIN32 && _MSC_VER >= 1600
#define HAVE_PPL 1 #define HAVE_PPL 1
#include <array> #include <ppl.h>
//#include <ppl.h>
#endif #endif
// Intel Thread Building Blocks (TBB). // Intel Thread Building Blocks (TBB).
@ -92,24 +91,9 @@ namespace nvtt {
#if defined(HAVE_PPL) #if defined(HAVE_PPL)
class CountingIterator
{
public:
CountingIterator() : i(0) {}
CountingIterator(const CountingIterator & rhs) : i(0) {}
explicit CountingIterator(int x) : i(x) {}
const int & operator*() const { return i; }
CountingIterator & operator++() { i++; return *this; }
CountingIterator & operator--() { i--; return *this; }
private:
int i;
};
struct TaskFunctor { struct TaskFunctor {
TaskFunctor(Task * task, void * context) : task(task), context(context) {} TaskFunctor(Task * task, void * context) : task(task), context(context) {}
void operator()(int & n) const { void operator()(int n) const {
task(context, n); task(context, n);
} }
Task * task; Task * task;
@ -121,12 +105,8 @@ namespace nvtt {
{ {
virtual void dispatch(Task * task, void * context, int count) virtual void dispatch(Task * task, void * context, int count)
{ {
CountingIterator begin(0);
CountingIterator end((int)count);
TaskFunctor func(task, context); TaskFunctor func(task, context);
Concurrency::parallel_for(0, count, func);
std::for_each(begin, end, func);
//parallel_for_each(begin, end, func);
} }
}; };