changeset 1107:25d3cfb85439 draft

debug use post task
author Yutaka_Kinjyo
date Mon, 10 Jan 2011 22:09:06 +0900
parents a1c5d7c51db0
children cbfedf774354
files Renderer/Engine/RenderingTasks.h Renderer/Engine/task/task_init.cc Renderer/Engine/viewer.cc
diffstat 3 files changed, 3 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/RenderingTasks.h	Mon Jan 03 18:04:08 2011 +0900
+++ b/Renderer/Engine/RenderingTasks.h	Mon Jan 10 22:09:06 2011 +0900
@@ -16,7 +16,6 @@
      DrawBack,
 
      RUN_LOOP_TASK,
-     RUN_DRAW_TASK,
      RENDERING_TASK,
 
      LoadTexture,
--- a/Renderer/Engine/task/task_init.cc	Mon Jan 03 18:04:08 2011 +0900
+++ b/Renderer/Engine/task/task_init.cc	Mon Jan 10 22:09:06 2011 +0900
@@ -16,7 +16,6 @@
 SchedExternTask(DrawBack);
 
 SchedExternTask(RUN_LOOP_TASK);
-SchedExternTask(RUN_DRAW_TASK);
 SchedExternTask(RENDERING_TASK);
 
 SchedExternTask(LoadTexture);
@@ -60,7 +59,6 @@
     SchedRegister( DrawBack);
 
     SchedRegister(RUN_LOOP_TASK);
-    SchedRegister(RUN_DRAW_TASK);
     SchedRegister(RENDERING_TASK);
 
     SchedRegister( LoadTexture);
--- a/Renderer/Engine/viewer.cc	Mon Jan 03 18:04:08 2011 +0900
+++ b/Renderer/Engine/viewer.cc	Mon Jan 10 22:09:06 2011 +0900
@@ -319,8 +319,7 @@
 
 void 
 Viewer::rendering(HTaskPtr task_next)
-{
-    common_rendering(task_next, sgroot);
+{    common_rendering(task_next, sgroot);
     
     // Barrier 同期
     // run_draw() を呼ぶ post2runDraw
@@ -336,7 +335,7 @@
 {
 
   Viewer* viewer = (Viewer*)smanager->get_param(0);
-  HTaskPtr task_next = smanager->create_task(RUN_DRAW_TASK, 0, 0, 0, 0); 
+  HTaskPtr task_next = smanager->create_task(RUN_LOOP_TASK, 0, 0, 0, 0); 
   task_next->set_param(0, (void*)viewer);
   viewer->run_draw(task_next);
 
@@ -356,21 +355,6 @@
     frames++;
 }
 
-SchedDefineTask1(RUN_DRAW_TASK, run_draw_task);
-
-static int
-run_draw_task(SchedTask* smanager, void* rbuf, void* wbuf) 
-{
-
-  Viewer* viewer = (Viewer*)smanager->get_param(0);
-  HTaskPtr task_next = smanager->create_task(RUN_LOOP_TASK, 0, 0, 0, 0); 
-  task_next->set_param(0, (void*)viewer);
-  viewer->run_loop(task_next);
-  frames++;
-
-  return 0;
-
-}
 
 void
 coord_allocate(int &cur_point, float *coord_pack, int spe_num,
@@ -595,8 +579,8 @@
                                    sizeof(SpanPack*)*r[spi].spackList_length_align);
         task_create_sp->add_inData(&r[spi].spackList[index_start], sizeof(SpanPack));
 
-        task_next->wait_for(task_create_sp);
         task_create_sp->wait_for(task_create_pp);
+	task_next->wait_for(task_create_sp);
 
 	task_create_sp->set_cpu(SPE_ANY);
 	// task_create_sp->set_cpu(CPU_PPE);