Mercurial > hg > Members > kono > Cerium
changeset 705:55159a5bf2c4
Redering on SIMPLE_TASK
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 14 Dec 2009 20:00:42 +0900 |
| parents | 6d497c098455 |
| children | e4d2b823903c |
| files | Renderer/Engine/Makefile.def Renderer/Engine/task/CreateSpan.cc Renderer/Test/Makefile.def TaskManager/kernel/schedule/SchedTask.h |
| diffstat | 4 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Engine/Makefile.def Mon Dec 14 19:54:00 2009 +0900 +++ b/Renderer/Engine/Makefile.def Mon Dec 14 20:00:42 2009 +0900 @@ -6,7 +6,7 @@ ABI = -m$(ABIBIT) CC = g++ OPT = -g -CFLAGS = -g -Wall $(ABI) $(OPT) # -O9 -DDEBUG +CFLAGS = -g -Wall $(ABI) $(OPT) -DSIMPLE_TASK # -DDEBUG INCLUDE = -I$(CERIUM)/include/TaskManager -I. # LIBS = -L$(CERIUM)/TaskManager -m$(ABIBIT)
--- a/Renderer/Engine/task/CreateSpan.cc Mon Dec 14 19:54:00 2009 +0900 +++ b/Renderer/Engine/task/CreateSpan.cc Mon Dec 14 20:00:42 2009 +0900 @@ -421,7 +421,7 @@ static int run(SchedTask *smanager, void *rbuf, void *wbuf) { - PolygonPack *pp = (PolygonPack*)smanager->get_input(0); + PolygonPack *pp = (PolygonPack*)smanager->get_input(rbuf, 0); PolygonPack *next_pp = (PolygonPack*)smanager->allocate(sizeof(PolygonPack)); PolygonPack *free_pp = next_pp; @@ -432,8 +432,8 @@ VertexPackPtr vMid10 = (VertexPackPtr)smanager->allocate(sizeof(VertexPack)); NormalPackPtr normal1,normal2, normal3; - SpanPackPtr *spackList = (SpanPackPtr*)smanager->get_input(1); - spack = (SpanPackPtr)smanager->get_input(2); + SpanPackPtr *spackList = (SpanPackPtr*)smanager->get_input(rbuf, 1); + spack = (SpanPackPtr)smanager->get_input(rbuf, 2); send_spack = (SpanPackPtr)smanager->allocate(sizeof(SpanPack)); prev_index = (long)smanager->get_param(0);
--- a/Renderer/Test/Makefile.def Mon Dec 14 19:54:00 2009 +0900 +++ b/Renderer/Test/Makefile.def Mon Dec 14 20:00:42 2009 +0900 @@ -4,7 +4,7 @@ ABIBIT = 32 ABI = -m$(ABIBIT) CC = g++ -CFLAGS = -g -Wall $(ABI) # -O -DDEBUG +CFLAGS = -g -Wall $(ABI) -DSIPMLE_TASK # -O -DDEBUG INCLUDE = -I$(CERIUM)/include/TaskManager -I$(CERIUM)/Renderer/Engine -I. -I$(CERIUM)/include/Cerium LIBS = -L$(CERIUM)/TaskManager -L$(CERIUM)/Renderer/Engine $(ABI)
--- a/TaskManager/kernel/schedule/SchedTask.h Mon Dec 14 19:54:00 2009 +0900 +++ b/TaskManager/kernel/schedule/SchedTask.h Mon Dec 14 20:00:42 2009 +0900 @@ -128,7 +128,6 @@ /*! SPU用の get_input, get_output */ -#ifndef SIMPLE_TASK void* get_input(int index) { return get_input(readbuf, index); } @@ -136,7 +135,6 @@ void* get_output(int index) { return get_output(writebuf, index); } -#endif // user HTaskPtr create_task(int cmd);