Mercurial > hg > Members > kono > Cerium

changeset 409:dd2ab68e4036

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix spe/*
author e065746@henri.cr.ie.u-ryukyu.ac.jp
date Wed, 23 Sep 2009 15:31:10 +0900
parents edfde944672a
children abe7c6021973
files TaskManager/Test/test_render/Makefile TaskManager/Test/test_render/spe/CreateSpan.cpp TaskManager/Test/test_render/spe/CreateSpan.h TaskManager/Test/test_render/spe/DrawBack.cpp TaskManager/Test/test_render/spe/DrawBack.h TaskManager/Test/test_render/spe/DrawSpan.cpp TaskManager/Test/test_render/spe/DrawSpan.h TaskManager/Test/test_render/spe/Load_Texture.cpp TaskManager/Test/test_render/spe/Load_Texture.h TaskManager/Test/test_render/spe/ShowTime.cpp TaskManager/Test/test_render/spe/ShowTime.h TaskManager/Test/test_render/task/Move.h TaskManager/Test/test_render/task/SendKey.h TaskManager/Test/test_render/task/task_init.cc
diffstat 14 files changed, 20 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Makefile	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/Makefile	Wed Sep 23 15:31:10 2009 +0900
@@ -33,7 +33,7 @@
 	perl tools/create_sglist.pl xml_file/*.xml 
 
 run-ps3:
-	ps3-video-mode -v 133
+	/usr/sbin/ps3-video-mode -v 133
 	./test_nogl -video fb -width 1920 -height 1080
 
 run-ps3tv:
--- a/TaskManager/Test/test_render/spe/CreateSpan.cpp	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/CreateSpan.cpp	Wed Sep 23 15:31:10 2009 +0900
@@ -192,7 +192,7 @@
  *                      長さの割合 (0 ... 1)
  */
 void
-CreateSpan::half_triangle(SpanPackPtr *spackList,
+CreateSpan::half_triangle(SchedTask *smanager, SpanPackPtr *spackList,
 			  int charge_y_top, int charge_y_end,
 			  TriangleTexInfoPtr tex_info,
 			  VertexPack *vMin,VertexPack *vMid,VertexPack *vMid10,
@@ -410,7 +410,7 @@
 
 
 int
-CreateSpan::run(void *rbuf, void *wbuf)
+CreateSpan::run(SchedTask *smanager, void *rbuf, void *wbuf)
 {
     __debug_spe("CreateSpan\n");
 
@@ -475,10 +475,10 @@
 	     * (vMax, vMid, vMid10) (vMin, vMid, vMid10) という
 	     * 二つの Triangle に分けている
 	     */
-	    half_triangle(spackList, charge_y_top, charge_y_end,
+	    half_triangle(smanager, spackList, charge_y_top, charge_y_end,
 			  tri_tex_info, vMin, vMid, vMid10,
 			  (int)(vMax->y - vMin->y), vMax->tex_y - vMin->tex_y);
-	    half_triangle(spackList, charge_y_top, charge_y_end,
+	    half_triangle(smanager, spackList, charge_y_top, charge_y_end,
 			  tri_tex_info, vMax, vMid, vMid10,
 			  (int)(vMax->y - vMin->y), vMax->tex_y - vMin->tex_y);
 	}
--- a/TaskManager/Test/test_render/spe/CreateSpan.h	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/CreateSpan.h	Wed Sep 23 15:31:10 2009 +0900
@@ -9,8 +9,8 @@
 public:
     SchedConstructor(CreateSpan);
     
-    int run(void *rbuf, void *wbuf);
-    void half_triangle(SpanPackPtr *spackList,
+    int run(SchedTask *smanager, void *rbuf, void *wbuf);
+    void half_triangle(SchedTask *smanager, SpanPackPtr *spackList,
 		       int charge_y_top, int charge_y_end,
 		       TriangleTexInfoPtr tex_info,
 		       VertexPack *vMin,VertexPack *vMid,VertexPack *vMid1,
--- a/TaskManager/Test/test_render/spe/DrawBack.cpp	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawBack.cpp	Wed Sep 23 15:31:10 2009 +0900
@@ -17,7 +17,7 @@
 }
 
 int
-DrawBack::run(void *rbuf, void *wbuf)
+DrawBack::run(SchedTask *smanager, void *rbuf, void *wbuf)
 {
     __debug_spe("DrawBack\n");
     int rgb          = smanager->get_param(0);
--- a/TaskManager/Test/test_render/spe/DrawBack.h	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawBack.h	Wed Sep 23 15:31:10 2009 +0900
@@ -7,7 +7,7 @@
 public:
     SchedConstructor(DrawBack);
 
-    int run(void *rbuf, void *wbuf);
+    int run(SchedTask *smanager, void *rbuf, void *wbuf);
 
     void linebuf_init(int *buf, int width, int rgb);
 };
--- a/TaskManager/Test/test_render/spe/DrawSpan.cpp	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpan.cpp	Wed Sep 23 15:31:10 2009 +0900
@@ -389,9 +389,10 @@
 }
 
 int
-DrawSpan::run(void *rbuf, void *wbuf)
+DrawSpan::run(SchedTask *smanager, void *rbuf, void *wbuf)
 {
     __debug_spe("DrawSpan\n");
+    this->smanager = smanager;
     SpanPackPtr spack = (SpanPackPtr)smanager->get_input(0);
     SpanPackPtr next_spack = (SpanPackPtr)smanager->allocate(sizeof(SpanPack));
     SpanPackPtr free_spack = next_spack; // next_spack の free() 用
--- a/TaskManager/Test/test_render/spe/DrawSpan.h	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpan.h	Wed Sep 23 15:31:10 2009 +0900
@@ -9,6 +9,8 @@
 public:
     SchedConstructor(DrawSpan);
 
+    SchedTask *smanager;
+
     int *linebuf;
     float *zRow;
     TileListPtr tileList;
@@ -16,7 +18,7 @@
 
     ~DrawSpan(void);
 
-    int run(void *rbuf, void *wbuf);
+    int run(SchedTask *smanager, void *rbuf, void *wbuf);
 
     int* linebuf_init(int width, int height, int rgb);
     float* zRow_init(int width, int height);
--- a/TaskManager/Test/test_render/spe/Load_Texture.cpp	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/Load_Texture.cpp	Wed Sep 23 15:31:10 2009 +0900
@@ -18,7 +18,7 @@
  * Hash の準備だけなので、名前変えないとなー
  */
 int
-LoadTexture::run(void *rbuf , void *wbuf)
+LoadTexture::run(SchedTask *smanager, void *rbuf , void *wbuf)
 {
     __debug_spe("LoadTexture\n");
 
--- a/TaskManager/Test/test_render/spe/Load_Texture.h	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/Load_Texture.h	Wed Sep 23 15:31:10 2009 +0900
@@ -8,7 +8,7 @@
 public:
     SchedConstructor(LoadTexture);
 
-    int run(void *rbuf, void *wbuf);
+    int run(SchedTask *smanager, void *rbuf, void *wbuf);
 };
 
 #endif
--- a/TaskManager/Test/test_render/spe/ShowTime.cpp	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/ShowTime.cpp	Wed Sep 23 15:31:10 2009 +0900
@@ -4,7 +4,7 @@
 SchedDefineTask(ShowTime);
 
 int
-ShowTime::run(void *rbuf, void *wbuf)
+ShowTime::run(SchedTask *smanager, void *rbuf, void *wbuf)
 {
     /*
      * ここで show_dma_wait() を呼びたい
--- a/TaskManager/Test/test_render/spe/ShowTime.h	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/spe/ShowTime.h	Wed Sep 23 15:31:10 2009 +0900
@@ -7,7 +7,7 @@
 public:
     SchedConstructor(ShowTime);
 
-    int run(void *r, void *w);
+    int run(SchedTask *smanager, void *r, void *w);
 };
 
 #endif
--- a/TaskManager/Test/test_render/task/Move.h	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/task/Move.h	Wed Sep 23 15:31:10 2009 +0900
@@ -8,7 +8,6 @@
     SchedConstructor(Move);
 
     int run(void *rbuf, void *wbuf);
-
 };
 
 #endif
--- a/TaskManager/Test/test_render/task/SendKey.h	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/task/SendKey.h	Wed Sep 23 15:31:10 2009 +0900
@@ -7,7 +7,7 @@
 public:
     SchedConstructor(SendKey);
 
-    int run(void *r, void *w);
+    int run(void *rbuf, void *wbuf);
 };
 
 #endif
--- a/TaskManager/Test/test_render/task/task_init.cc	Wed Sep 23 14:38:38 2009 +0900
+++ b/TaskManager/Test/test_render/task/task_init.cc	Wed Sep 23 15:31:10 2009 +0900
@@ -48,8 +48,8 @@
 
     SchedRegisterTask(TASK_DUMMY, Dummy);
 
+    SchedRegisterTask(SEND_KEY, SendKey);
     SchedRegisterTask(SHOW_TIME, ShowTime);
-    SchedRegisterTask(SEND_KEY, SendKey);
 
     // usr
     SchedRegisterTask(CHAIN_MOVE, ChainMove);