Mercurial > hg > Game > Cerium
changeset 491:5b28c96f48a3 draft
fix
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 06 Oct 2009 17:14:05 +0900 |
| parents | afda1d2ec9a3 |
| children | 6b2dda81ea9d |
| files | TaskManager/Cell/CellTaskManagerImpl.cc TaskManager/Cell/spe/CellScheduler.cc TaskManager/Fifo/FifoTaskManagerImpl.cc |
| diffstat | 3 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/CellTaskManagerImpl.cc Tue Oct 06 15:33:08 2009 +0900 +++ b/TaskManager/Cell/CellTaskManagerImpl.cc Tue Oct 06 17:14:05 2009 +0900 @@ -88,7 +88,6 @@ // ここ...直すかな TaskListPtr list; - TaskQueuePtr d; HTaskPtr htask; TaskPtr task; int speid; @@ -130,7 +129,7 @@ } task = &list->tasks[list->length++]; -#if 0 +#if 1 task->command = htask->command; task->inData = htask->inData; task->outData = htask->outData;
--- a/TaskManager/Cell/spe/CellScheduler.cc Tue Oct 06 15:33:08 2009 +0900 +++ b/TaskManager/Cell/spe/CellScheduler.cc Tue Oct 06 17:14:05 2009 +0900 @@ -68,14 +68,16 @@ */ #define TEX_LOAD1 0 -#define TEX_LOAD2 1 +// #define TEX_LOAD2 1 uint32 CellScheduler::get_tag() { static int count = 0; - int i = (count++ % 2); - return TEX_LOAD1*i + TEX_LOAD2*(1-i); + // int i = (count++ % 2); + // return TEX_LOAD1*i + TEX_LOAD2*(1-i); + // 0,1,2,3 + return TEX_LOAD1+(count++ % 4); }
--- a/TaskManager/Fifo/FifoTaskManagerImpl.cc Tue Oct 06 15:33:08 2009 +0900 +++ b/TaskManager/Fifo/FifoTaskManagerImpl.cc Tue Oct 06 17:14:05 2009 +0900 @@ -106,8 +106,15 @@ htask = (HTaskPtr)queue->task; task = &list->tasks[list->length++]; +#if 1 + task->command = htask->command; + task->inData = htask->inData; + task->outData = htask->outData; + task->self = (unsigned int)htask; +#else + memcpy(task, (Task*)htask, sizeof(Task)); +#endif - memcpy(task, (Task*)htask, sizeof(Task)); if (list->length >= TASK_MAX_SIZE) { TaskListPtr newList = taskListImpl->create();