Mercurial > hg > Members > kono > Cerium

diff TaskManager/Test/simple_pack/spu_span.h @ 109:5c194c71eca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cerium cvs version
author gongo@gendarme.local
date Wed, 12 Nov 2008 17:39:33 +0900
parents c2e178b3415f
children
line wrap: on
line diff
--- a/TaskManager/Test/simple_pack/spu_span.h	Wed Nov 12 17:29:35 2008 +0900
+++ b/TaskManager/Test/simple_pack/spu_span.h	Wed Nov 12 17:39:33 2008 +0900
@@ -6,14 +6,25 @@
 #endif
 
 typedef struct SPUSPAN {
+<<<<<<< spu_span.h
+    int length;
+    SPUSPAN *next;
+    //SPANPACK_PTR spp[64];
+    SPANPACK sp[1];
+=======
   int length;
   //SPANPACK spp[23];  // window_height = 1080  ( 1080/8/6 = 22.5 )
   SPANPACK spp[10];   // window_height = 480  ( 480/8/6 = 10 )
   //SPUSPAN *next;
+>>>>>>> 1.2
 } SPUSPAN;
 
 typedef struct SPUSPANLIST {
+<<<<<<< spu_span.h
+    SPUSPAN ss[6];
+=======
   SPUSPAN ss[6];  // 6 = number of SPU
+>>>>>>> 1.2
 } SPUSPANLIST;
 
 /*