Mercurial > hg > Members > kono > Cerium

annotate TaskManager/Test/test_render/spe/DrawSpan.cc @ 470:bf32e35f1afa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix_relocation for function table...
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 02 Oct 2009 17:27:45 +0900
parents 96c941eae962
children 699ee087234e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
322
4be5ae77e02c remove debug
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 321
diff changeset
1 // #define DEBUG
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
2 #include "error.h"
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
3
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
4 #include <stdlib.h>
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
5 #include <string.h>
200
10ad99550ee8 fix run_draw
gongo@localhost.localdomain
parents: 194
diff changeset
6 #include <spu_intrinsics.h>
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
7 #include "DrawSpan.h"
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
8 #include "polygon_pack.h"
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
9 #include "texture.h"
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
10 #include "viewer_types.h"
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
11 #include "Func.h"
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
12 #include "global_alloc.h"
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
13
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
14 SchedDefineTask(DrawSpan);
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
15 SchedDefineTask1(DrawSpanEnd,draw_span_end);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
16
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
17 #define TEX_LOAD1 0
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
18 #define TEX_LOAD2 1
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
19 #define SPAN_PACK_LOAD 2
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
20 #define FB_STORE 3
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
21
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
22 static int
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
23 draw_span_end(SchedTask *s, void *rbuf, void *wbuf)
193
gongo@localhost.localdomain
parents: 192
diff changeset
24 {
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
25 Gptr g = (Gptr)s->get_param(0);
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
26 s->dma_wait(FB_STORE);
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
27 free((void*)((int)g->linebuf*g->doneWrite));
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
28 free(g);
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
29 return 0;
193
gongo@localhost.localdomain
parents: 192
diff changeset
30 }
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
31
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
32
205
gongo@localhost.localdomain
parents: 203
diff changeset
33 inline vector float
gongo@localhost.localdomain
parents: 203
diff changeset
34 spu_re_nrm(vector float a)
gongo@localhost.localdomain
parents: 203
diff changeset
35 {
gongo@localhost.localdomain
parents: 203
diff changeset
36 vector float unit = (vector float){1.0, 1.0, 1.0, 1.0};
gongo@localhost.localdomain
parents: 203
diff changeset
37 vector float approximation;
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
38
205
gongo@localhost.localdomain
parents: 203
diff changeset
39 approximation = spu_re(a);
gongo@localhost.localdomain
parents: 203
diff changeset
40 return spu_madd(spu_nmsub(approximation, a, unit),
gongo@localhost.localdomain
parents: 203
diff changeset
41 approximation, approximation);
gongo@localhost.localdomain
parents: 203
diff changeset
42 }
gongo@localhost.localdomain
parents: 203
diff changeset
43
gongo@localhost.localdomain
parents: 203
diff changeset
44
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
45 static vector signed int
205
gongo@localhost.localdomain
parents: 203
diff changeset
46 getLocalPositionVec(vector signed int d, signed int offset)
gongo@localhost.localdomain
parents: 203
diff changeset
47 {
gongo@localhost.localdomain
parents: 203
diff changeset
48 return spu_and(d, spu_splats(offset-1));
gongo@localhost.localdomain
parents: 203
diff changeset
49 }
gongo@localhost.localdomain
parents: 203
diff changeset
50
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
51 static vector signed int
205
gongo@localhost.localdomain
parents: 203
diff changeset
52 getLocalXVec(vector signed int x)
gongo@localhost.localdomain
parents: 203
diff changeset
53 {
gongo@localhost.localdomain
parents: 203
diff changeset
54 return getLocalPositionVec(x, split_screen_w);
gongo@localhost.localdomain
parents: 203
diff changeset
55 }
gongo@localhost.localdomain
parents: 203
diff changeset
56
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
57
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
58 /**
193
gongo@localhost.localdomain
parents: 192
diff changeset
59 * テクスチャは、TEXTURE_SPLIT_PIXEL^2 のブロックに分割する
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
60 *
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
61 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
62 * | 0 | 1 | 2 | 3 | 4 | 5 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
63 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
64 * | | | | | |11 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
65 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
66 * | | | | | |17 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
67 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
68 * | | | | | |23 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
69 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
70 * | | | | | |29 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
71 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
72 * | | | | | |35 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
73 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
74 *
193
gongo@localhost.localdomain
parents: 192
diff changeset
75 * 一辺を TEXTURE_SPLIT とする
gongo@localhost.localdomain
parents: 192
diff changeset
76 * 各ブロックの数字がブロックIDとなる。
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
77 */
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
78
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
79 /**
193
gongo@localhost.localdomain
parents: 192
diff changeset
80 * テクスチャの座標から、
gongo@localhost.localdomain
parents: 192
diff changeset
81 * テクスチャのどのブロックかを求める
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
82 *
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
83 * @param[in] tx X coordinates of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
84 * @param[in] tx Y coordinates of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
85 * @param[in] twidth Width of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
86 * @return block ID
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
87 */
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
88 static int
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
89 getTexBlock(int tx, int ty, int twidth)
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
90 {
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
91 int blockX, blockY;
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
92
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
93 blockX = tx / TEXTURE_SPLIT_PIXEL;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
94 blockY = ty / TEXTURE_SPLIT_PIXEL;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
95
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
96 return blockX + (twidth/TEXTURE_SPLIT_PIXEL)*blockY;
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
97 }
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
98
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
99 /**
193
gongo@localhost.localdomain
parents: 192
diff changeset
100 * block ID と、テクスチャの TOP address から
gongo@localhost.localdomain
parents: 192
diff changeset
101 * (tx,ty) で使われるテクスチャの Tile addres を求める
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
102 *
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
103 * @param[in] tx X coordinates of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
104 * @param[in] tx Y coordinates of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
105 * @param[in] tw Width of texture
193
gongo@localhost.localdomain
parents: 192
diff changeset
106 * @param[in] tex_addr_top (tx,ty) で使うテクスチャの先頭address
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
107 * @return block ID
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
108 */
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
109 static memaddr
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
110 getTile(int tx, int ty, int tw, memaddr tex_addr_top)
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
111 {
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
112 int block = getTexBlock(tx, ty, tw);
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 371
diff changeset
113 return tex_addr_top + block*TEXTURE_BLOCK_SIZE * sizeof(uint32);
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
114 }
120
a52e193f9a42 fix Load Texture
gongo@gendarme.local
parents: 109
diff changeset
115
193
gongo@localhost.localdomain
parents: 192
diff changeset
116 /**
gongo@localhost.localdomain
parents: 192
diff changeset
117 * FrameBuffer に書き込む rgb の領域初期化
gongo@localhost.localdomain
parents: 192
diff changeset
118 *
gongo@localhost.localdomain
parents: 192
diff changeset
119 * @param width Width of Buffer
gongo@localhost.localdomain
parents: 192
diff changeset
120 * @param height Height of Buffer
gongo@localhost.localdomain
parents: 192
diff changeset
121 * @param rgb Initial value of RGB at Buffer
gongo@localhost.localdomain
parents: 192
diff changeset
122 * @return Buffer
gongo@localhost.localdomain
parents: 192
diff changeset
123 */
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
124 static int*
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
125 linebuf_init(SchedTask *smanager, int width, int height, int rgb)
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
126 {
193
gongo@localhost.localdomain
parents: 192
diff changeset
127 int *buf = (int*)smanager->allocate(sizeof(int)*width*height);
gongo@localhost.localdomain
parents: 192
diff changeset
128
gongo@localhost.localdomain
parents: 192
diff changeset
129 for (int i = 0; i < width*height; i++) {
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
130 buf[i] = rgb;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
131 }
193
gongo@localhost.localdomain
parents: 192
diff changeset
132
gongo@localhost.localdomain
parents: 192
diff changeset
133 return buf;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
134 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
135
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
136 /**
193
gongo@localhost.localdomain
parents: 192
diff changeset
137 * Z-Buffer の初期化
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
138 *
193
gongo@localhost.localdomain
parents: 192
diff changeset
139 * @param width Width of Z-Buffer
gongo@localhost.localdomain
parents: 192
diff changeset
140 * @param height Height of Z-Buffer
gongo@localhost.localdomain
parents: 192
diff changeset
141 * @return Z-Buffer
gongo@localhost.localdomain
parents: 192
diff changeset
142 */
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
143 static float*
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
144 zRow_init(SchedTask *smanager, int width, int height)
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
145 {
193
gongo@localhost.localdomain
parents: 192
diff changeset
146 float *buf = (float*)smanager->allocate(sizeof(float)*width*height);
gongo@localhost.localdomain
parents: 192
diff changeset
147 float def = 65535.0f;
gongo@localhost.localdomain
parents: 192
diff changeset
148
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
149 vector float init = spu_splats(0.0f);
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
150 vector float defi = spu_splats(def);
200
10ad99550ee8 fix run_draw
gongo@localhost.localdomain
parents: 194
diff changeset
151
10ad99550ee8 fix run_draw
gongo@localhost.localdomain
parents: 194
diff changeset
152 for (int i = 0; i < width*height; i += 4) {
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
153 vector float *out = (vector float *)&buf[i];
200
10ad99550ee8 fix run_draw
gongo@localhost.localdomain
parents: 194
diff changeset
154
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
155 *out = spu_add(init, defi);
200
10ad99550ee8 fix run_draw
gongo@localhost.localdomain
parents: 194
diff changeset
156 }
193
gongo@localhost.localdomain
parents: 192
diff changeset
157
gongo@localhost.localdomain
parents: 192
diff changeset
158 return buf;
gongo@localhost.localdomain
parents: 192
diff changeset
159 }
gongo@localhost.localdomain
parents: 192
diff changeset
160
389
016d45583994 MemHash for Cell
kono@localhost.localdomain
parents: 387
diff changeset
161
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
162 static uint32
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
163 get_rgb(int tx, int ty, TilePtr tile)
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
164 {
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 371
diff changeset
165 uint32 *data = (uint32 *)tile->data;
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 371
diff changeset
166 return data[(TEXTURE_SPLIT_PIXEL)*ty+tx];
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
167 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
168
387
5e2d30bfbf23 no compile error but not worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 380
diff changeset
169 #if 0
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
170 /**
193
gongo@localhost.localdomain
parents: 192
diff changeset
171 * DrawSpan の再起動 (DrawSpanRenew 生成)
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
172 *
193
gongo@localhost.localdomain
parents: 192
diff changeset
173 * @param[in] spack 現在処理している SpanPack
gongo@localhost.localdomain
parents: 192
diff changeset
174 * @param[in] cur_span_x span->length_x != 1 の時の Span の処理で
gongo@localhost.localdomain
parents: 192
diff changeset
175 * どこまで進んでいるか
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
176 */
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
177 void
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
178 DrawSpan::reboot(SpanPackPtr spack, int cur_span_x)
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
179 {
193
gongo@localhost.localdomain
parents: 192
diff changeset
180 DrawSpanArgPtr args =
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
181 (DrawSpanArgPtr)smanager->allocate(sizeof(DrawSpanArg));
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
182 TaskPtr renew_task = smanager->create_task(TASK_DRAW_SPAN2);
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
183
193
gongo@localhost.localdomain
parents: 192
diff changeset
184 // 数が多いので構造体で渡す
gongo@localhost.localdomain
parents: 192
diff changeset
185 args->display = smanager->get_param(0);
gongo@localhost.localdomain
parents: 192
diff changeset
186 args->screen_width = smanager->get_param(1);
gongo@localhost.localdomain
parents: 192
diff changeset
187 args->rangex_start = smanager->get_param(2);
gongo@localhost.localdomain
parents: 192
diff changeset
188 args->rangex_end = smanager->get_param(3);
gongo@localhost.localdomain
parents: 192
diff changeset
189 args->rangey = smanager->get_param(4);
gongo@localhost.localdomain
parents: 192
diff changeset
190 renew_task->add_param((int)args);
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
191
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
192 /**
193
gongo@localhost.localdomain
parents: 192
diff changeset
193 * SpanPack は続きから開始するので、
gongo@localhost.localdomain
parents: 192
diff changeset
194 * 現在の状態をコピーしておく。
gongo@localhost.localdomain
parents: 192
diff changeset
195 * spack は rbuf から取得してる可能性があり
gongo@localhost.localdomain
parents: 192
diff changeset
196 * rbuf はシステムが自動的に free() するため
gongo@localhost.localdomain
parents: 192
diff changeset
197 * アドレスだけ渡すのはNG
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
198 */
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
199 SpanPackPtr curr = (SpanPackPtr)smanager->allocate(sizeof(SpanPack));
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
200 memcpy(curr, spack, sizeof(SpanPack));
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
201 renew_task->add_param((int)curr);
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
202 renew_task->add_param(cur_span_x);
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
203
193
gongo@localhost.localdomain
parents: 192
diff changeset
204 // linebuf と zRow も引き継がせる
gongo@localhost.localdomain
parents: 192
diff changeset
205 renew_task->add_param((int)linebuf);
gongo@localhost.localdomain
parents: 192
diff changeset
206 renew_task->add_param((int)zRow);
gongo@localhost.localdomain
parents: 192
diff changeset
207
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
208 /**
193
gongo@localhost.localdomain
parents: 192
diff changeset
209 * 再起動したタスクを待つ
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
210 */
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
211 smanager->wait_task(renew_task);
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
212
193
gongo@localhost.localdomain
parents: 192
diff changeset
213 // next_spack は free() するので wait する
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
214 smanager->dma_wait(SPAN_PACK_LOAD);
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
215 }
389
016d45583994 MemHash for Cell
kono@localhost.localdomain
parents: 387
diff changeset
216 #endif
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
217
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
218 static void
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
219 writebuffer(SchedTask *smanager, Gptr g, unsigned int display,
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
220 int buf_width, int height, int screen_width)
193
gongo@localhost.localdomain
parents: 192
diff changeset
221 {
gongo@localhost.localdomain
parents: 192
diff changeset
222 for (int i = 0; i < height; i++) {
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
223 smanager->dma_store(&g->linebuf[i*buf_width],
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
224 display + (sizeof(int)*screen_width*i),
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
225 sizeof(int)*buf_width, FB_STORE);
193
gongo@localhost.localdomain
parents: 192
diff changeset
226 }
gongo@localhost.localdomain
parents: 192
diff changeset
227
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
228 g->doneWrite = 1;
193
gongo@localhost.localdomain
parents: 192
diff changeset
229 }
gongo@localhost.localdomain
parents: 192
diff changeset
230
205
gongo@localhost.localdomain
parents: 203
diff changeset
231 /**
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
232 * zRow と Linebuf を更新する
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
233 *
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
234 * @param zpos 更新する pixel のZ座標
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
235 * @param rangex このタスクが処理する描画領域の x の長さ
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
236 * @param x pixel の、描画領域内での x 座標
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
237 * @param y 〃 の、y 座標
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
238 * @param tex_x pixel が使用するテクスチャの、Tile (8x8) 内での x 座標
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
239 * @param tex_y 〃 の y 座標
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
240 * @param tex_addr テクスチャのアドレス(MainMemory)
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
241 */
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
242 static void
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
243 updateBuffer(Gptr g, float zpos, int rangex, int x, int y,
354
81b25e5d5379 add example/get_segment and change spe/DrawSpan.cpp
koba
parents: 273
diff changeset
244 int tex_x, int tex_y, TilePtr tile)
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
245 {
354
81b25e5d5379 add example/get_segment and change spe/DrawSpan.cpp
koba
parents: 273
diff changeset
246 int rgb = get_rgb(tex_x, tex_y, tile);
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
247
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
248 g->zRow[x + (rangex*y)] = zpos;
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
249 g->linebuf[x + (rangex*y)] = rgb;
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
250 }
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
251
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
252 /**
205
gongo@localhost.localdomain
parents: 203
diff changeset
253 * 長さが 1 の Span の描画 (要するに 1 pixel)
gongo@localhost.localdomain
parents: 203
diff changeset
254 *
gongo@localhost.localdomain
parents: 203
diff changeset
255 * @param span Span
gongo@localhost.localdomain
parents: 203
diff changeset
256 * @param startx 描画開始範囲
gongo@localhost.localdomain
parents: 203
diff changeset
257 * @param endx 描画終了範囲
gongo@localhost.localdomain
parents: 203
diff changeset
258 */
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
259
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
260 static int
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
261 drawDot1(SchedTask *smanager, Gptr g, SpanPtr span, int startx, int endx, int wait_tag)
205
gongo@localhost.localdomain
parents: 203
diff changeset
262 {
gongo@localhost.localdomain
parents: 203
diff changeset
263 int rangex = endx - startx + 1;
gongo@localhost.localdomain
parents: 203
diff changeset
264
gongo@localhost.localdomain
parents: 203
diff changeset
265 /* span->x に対応する Texture の座標 (tex_xpos, tex_ypos) */
gongo@localhost.localdomain
parents: 203
diff changeset
266 int tex_xpos, tex_ypos;
gongo@localhost.localdomain
parents: 203
diff changeset
267
gongo@localhost.localdomain
parents: 203
diff changeset
268 // span の始点に対応する Texture の座標 (tex1, tey1)
gongo@localhost.localdomain
parents: 203
diff changeset
269 float tex = span->tex_x1;
gongo@localhost.localdomain
parents: 203
diff changeset
270 float tey = span->tex_y1;
gongo@localhost.localdomain
parents: 203
diff changeset
271
gongo@localhost.localdomain
parents: 203
diff changeset
272 // span の始点に対応する z 座標
gongo@localhost.localdomain
parents: 203
diff changeset
273 float zpos = span->start_z;
gongo@localhost.localdomain
parents: 203
diff changeset
274
gongo@localhost.localdomain
parents: 203
diff changeset
275 /* Tile 内での座標 */
gongo@localhost.localdomain
parents: 203
diff changeset
276 int localx = getLocalX(span->x-1);
gongo@localhost.localdomain
parents: 203
diff changeset
277 int localy = getLocalY(span->y-1);
gongo@localhost.localdomain
parents: 203
diff changeset
278
gongo@localhost.localdomain
parents: 203
diff changeset
279 /**
gongo@localhost.localdomain
parents: 203
diff changeset
280 * (tex_xpos, tex_ypos) の、Tile 内(上の図参照)での座標と
gongo@localhost.localdomain
parents: 203
diff changeset
281 * そのブロックのアドレス(MainMemory)
gongo@localhost.localdomain
parents: 203
diff changeset
282 */
gongo@localhost.localdomain
parents: 203
diff changeset
283 int tex_localx;
gongo@localhost.localdomain
parents: 203
diff changeset
284 int tex_localy;
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 371
diff changeset
285 memaddr tex_addr;
205
gongo@localhost.localdomain
parents: 203
diff changeset
286
gongo@localhost.localdomain
parents: 203
diff changeset
287 if (span->x < startx || endx < span->x) {
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
288 return -1;
205
gongo@localhost.localdomain
parents: 203
diff changeset
289 }
gongo@localhost.localdomain
parents: 203
diff changeset
290
gongo@localhost.localdomain
parents: 203
diff changeset
291 tex_xpos = (int)((span->tex_width-1) * tex);
gongo@localhost.localdomain
parents: 203
diff changeset
292 tex_ypos = (int)((span->tex_height-1) * tey);
gongo@localhost.localdomain
parents: 203
diff changeset
293
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
294 if (zpos < g->zRow[localx + (rangex*localy)]) {
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
295 tex_addr = getTile(tex_xpos, tex_ypos,
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 371
diff changeset
296 span->tex_width, (memaddr)span->tex_addr);
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
297 tex_localx = tex_xpos % TEXTURE_SPLIT_PIXEL;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
298 tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
205
gongo@localhost.localdomain
parents: 203
diff changeset
299
389
016d45583994 MemHash for Cell
kono@localhost.localdomain
parents: 387
diff changeset
300 TilePtr tile = smanager->get_segment(tex_addr,tileList);
016d45583994 MemHash for Cell
kono@localhost.localdomain
parents: 387
diff changeset
301 smanager->wait_segment(tile);
205
gongo@localhost.localdomain
parents: 203
diff changeset
302
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
303 updateBuffer(g, zpos, rangex, localx, localy,
356
b89ba1d96fff merge heads
aaa
parents: 354 352
diff changeset
304 tex_localx, tex_localy, tile);
205
gongo@localhost.localdomain
parents: 203
diff changeset
305 }
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
306
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
307 return -1;
205
gongo@localhost.localdomain
parents: 203
diff changeset
308 }
gongo@localhost.localdomain
parents: 203
diff changeset
309
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
310
233
gongo@localhost.localdomain
parents: 213
diff changeset
311 /**
gongo@localhost.localdomain
parents: 213
diff changeset
312 * 長さが 1 より大きい Span の描画
gongo@localhost.localdomain
parents: 213
diff changeset
313 *
gongo@localhost.localdomain
parents: 213
diff changeset
314 * 本来の目的として、この関数(drawLine1) では
gongo@localhost.localdomain
parents: 213
diff changeset
315 * : 既に SPE 上に Tile のある pixel だけ描画
gongo@localhost.localdomain
parents: 213
diff changeset
316 * : それ以外は、ここで予め DMA load しておき、
gongo@localhost.localdomain
parents: 213
diff changeset
317 * : drawLine2 で一気に描画する
gongo@localhost.localdomain
parents: 213
diff changeset
318 * ってものだったんだけど、どうも上手く行かなかったので
gongo@localhost.localdomain
parents: 213
diff changeset
319 * 今は drawLine1 で load -> wait -> rendering を全部やってます
gongo@localhost.localdomain
parents: 213
diff changeset
320 * (rendering といっても、rendering buffer に書き込むだけで
gongo@localhost.localdomain
parents: 213
diff changeset
321 * まだ main memory (frame buffer) に dma store してるわけではない)
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
322 *
233
gongo@localhost.localdomain
parents: 213
diff changeset
323 * @param span Span
gongo@localhost.localdomain
parents: 213
diff changeset
324 * @param startx 描画開始範囲
gongo@localhost.localdomain
parents: 213
diff changeset
325 * @param endx 描画終了範囲
gongo@localhost.localdomain
parents: 213
diff changeset
326 * @return 「span のどの位置まで rendering が終わったか」の x 座標
gongo@localhost.localdomain
parents: 213
diff changeset
327 */
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
328 static int
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
329 drawLine1(SchedTask *smanager, Gptr g, SpanPtr span, int startx, int endx, int wait_tag)
205
gongo@localhost.localdomain
parents: 203
diff changeset
330 {
gongo@localhost.localdomain
parents: 203
diff changeset
331 int x = span->x;
gongo@localhost.localdomain
parents: 203
diff changeset
332 int rangex = endx - startx + 1;
gongo@localhost.localdomain
parents: 203
diff changeset
333 int x_len = span->length_x;
gongo@localhost.localdomain
parents: 203
diff changeset
334
gongo@localhost.localdomain
parents: 203
diff changeset
335 int js = (x < startx) ? startx - x : 0;
gongo@localhost.localdomain
parents: 203
diff changeset
336 int je = (x + x_len > endx) ? endx - x : x_len;
gongo@localhost.localdomain
parents: 203
diff changeset
337
gongo@localhost.localdomain
parents: 203
diff changeset
338 /* span->x に対応する Texture の座標 (tex_xpos, tex_ypos) */
gongo@localhost.localdomain
parents: 203
diff changeset
339 int tex_xpos, tex_ypos;
gongo@localhost.localdomain
parents: 203
diff changeset
340
gongo@localhost.localdomain
parents: 203
diff changeset
341 // span の始点に対応する座標 (tex1, tey1)
gongo@localhost.localdomain
parents: 203
diff changeset
342 float tex1 = span->tex_x1;
gongo@localhost.localdomain
parents: 203
diff changeset
343 float tey1 = span->tex_y1;
gongo@localhost.localdomain
parents: 203
diff changeset
344
gongo@localhost.localdomain
parents: 203
diff changeset
345 // span の終点に対応する座標 (tex2, tey2)
gongo@localhost.localdomain
parents: 203
diff changeset
346 float tex2 = span->tex_x2;
gongo@localhost.localdomain
parents: 203
diff changeset
347 float tey2 = span->tex_y2;
gongo@localhost.localdomain
parents: 203
diff changeset
348
gongo@localhost.localdomain
parents: 203
diff changeset
349 // span の始点、終点に対応する z 座標
gongo@localhost.localdomain
parents: 203
diff changeset
350 float zpos1 = span->start_z;
gongo@localhost.localdomain
parents: 203
diff changeset
351 float zpos2 = span->end_z;
gongo@localhost.localdomain
parents: 203
diff changeset
352
gongo@localhost.localdomain
parents: 203
diff changeset
353 // Tile 内での座標
gongo@localhost.localdomain
parents: 203
diff changeset
354 int localx, localy = getLocalY(span->y-1);
gongo@localhost.localdomain
parents: 203
diff changeset
355
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
356 int ret = je+1;
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
357
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
358 //for (int j = js; j <= je; j++) {
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
359 for (int j = je; j >= js; j--) {
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
360 float tex_x, tex_y, tex_z;
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
361
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
362 localx = getLocalX(x-1+j);
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
363
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
364 tex_z = zpos1*(x_len-1-j)/(x_len-1) + zpos2*j/(x_len-1);
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
365
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
366 tex_x = tex1*(x_len-1-j)/(x_len-1) + tex2*j/(x_len-1);
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
367 tex_y = tey1*(x_len-1-j)/(x_len-1) + tey2*j/(x_len-1);
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
368 if (tex_x > 1) tex_x = 1;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
369 if (tex_x < 0) tex_x = 0;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
370 if (tex_y > 1) tex_y = 1;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
371 if (tex_y < 0) tex_y = 0;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
372 tex_xpos = (int)((span->tex_width-1) * tex_x);
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
373 tex_ypos = (int)((span->tex_height-1) * tex_y);
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
374
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
375 if (tex_z < g->zRow[localx + (rangex*localy)]) {
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
376 // (tex_xpos, tex_ypos) の、Tile 内(上の図参照)での座標と
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
377 // そのブロックのアドレス(MainMemory)
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 371
diff changeset
378 memaddr tex_addr;
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
379 int tex_localx;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
380 int tex_localy;
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
381
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
382 tex_addr = getTile(tex_xpos, tex_ypos,
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 371
diff changeset
383 span->tex_width, (memaddr)span->tex_addr);
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
384 tex_localx = tex_xpos % TEXTURE_SPLIT_PIXEL;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
385 tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
386
391
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 389
diff changeset
387 TilePtr tile = smanager->get_segment(tex_addr,tileList);
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 389
diff changeset
388 smanager->wait_segment(tile);
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
389
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
390 updateBuffer(g, tex_z, rangex, localx, localy,
356
b89ba1d96fff merge heads
aaa
parents: 354 352
diff changeset
391 tex_localx, tex_localy, tile);
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
392 }
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
393 }
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
394
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
395 return ret;
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
396 }
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
397
470
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
398 void
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
399 fix_relocation((void**)addr,int count)
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
400 {
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
401 unsigned int pc;
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
402 unsigned int label;
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
403 __asm__ __volatile__(
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
404 " brsl %0,____LLLL\n"
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
405 "____LLLL:"
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
406 " lia %1,____LLLL"
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
407 : "=r" (pc), "=r" (label));
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
408 int offset = pc-label;
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
409 int i;
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
410 for(i=0;i<count;i++) {
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
411 addr[i] += offset;
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
412 }
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
413 }
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
414
467
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
415 static int
44c0bce54dcf fix all examples. test_render is not working now.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 423
diff changeset
416 run(SchedTask *smanager, void *rbuf, void *wbuf)
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
417 {
321
f64d75473f95 merge 317
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 318
diff changeset
418 __debug_spe("DrawSpan\n");
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
419 Gptr g = (Gptr)smanager->allocate(sizeof(G));
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
420
193
gongo@localhost.localdomain
parents: 192
diff changeset
421 SpanPackPtr spack = (SpanPackPtr)smanager->get_input(0);
gongo@localhost.localdomain
parents: 192
diff changeset
422 SpanPackPtr next_spack = (SpanPackPtr)smanager->allocate(sizeof(SpanPack));
gongo@localhost.localdomain
parents: 192
diff changeset
423 SpanPackPtr free_spack = next_spack; // next_spack の free() 用
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
424 Span *span;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
425
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
426 Span nop_span;
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
427 nop_span.length_x = 1;
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
428
470
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
429 int (*drawFunc1[2])(SchedTask *, Gptr, SpanPtr, int, int, int) = {
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
430 &drawDot1, &drawLine1
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
431 };
470
bf32e35f1afa fix_relocation for function table...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 469
diff changeset
432 fix_relocation((void**)drawFunc1,2);
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
433
193
gongo@localhost.localdomain
parents: 192
diff changeset
434 uint32 display = smanager->get_param(0);
gongo@localhost.localdomain
parents: 192
diff changeset
435 int screen_width = smanager->get_param(1);
gongo@localhost.localdomain
parents: 192
diff changeset
436 int rangex_start = smanager->get_param(2);
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
437 int rangex_end = smanager->get_param(3);
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
438
193
gongo@localhost.localdomain
parents: 192
diff changeset
439 // このタスクが担当する x の範囲
gongo@localhost.localdomain
parents: 192
diff changeset
440 int rangex = rangex_end - rangex_start + 1;
gongo@localhost.localdomain
parents: 192
diff changeset
441
gongo@localhost.localdomain
parents: 192
diff changeset
442 // y の範囲
gongo@localhost.localdomain
parents: 192
diff changeset
443 int rangey = smanager->get_param(4);
203
5c6c9667ac61 fix CreateSpan::run
gongo@localhost.localdomain
parents: 200
diff changeset
444
167
c8b868871dce DrawSpan で使う Tile の Hash の扱いは class TileHash を生成する事に。
gongo@localhost.localdomain
parents: 166
diff changeset
445 tileList = (TileListPtr)smanager->global_get(GLOBAL_TILE_LIST);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
446
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
447 g->zRow = zRow_init(rangex, rangey);
213
159519cdca1f add SceneGraph "3D Super-Dandy"
gongo@localhost.localdomain
parents: 212
diff changeset
448 //linebuf = linebuf_init(rangex, rangey, 0x00ffffff);
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
449 g->linebuf = linebuf_init(rangex, rangey, 0);
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
450
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
451 g->doneWrite = 0;
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
452
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
453 int tl_tag[2] = {TEX_LOAD1, TEX_LOAD2};
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
454 int tl_tag_flg1 = 0;
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
455 int tl_tag_flg2 = 1;
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
456
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
457 do {
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
458 /**
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
459 * SpanPack->next が存在する場合、
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
460 * 現在の SpanPack を処理してる間に
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
461 * 次の SpanPack の DMA 転送を行う
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
462 */
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
463 if (spack->next != NULL) {
380
b4b8345b5366 ps3 fix
e065701@localhost.localdomain
parents: 371
diff changeset
464 smanager->dma_load(next_spack, (memaddr)spack->next,
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
465 sizeof(SpanPack), SPAN_PACK_LOAD);
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
466 } else {
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
467 next_spack = NULL;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
468 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
469
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
470 SpanPtr resume_span = &nop_span;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
471 int resume_span_x = 0;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
472
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
473 for (int t = 0; t < spack->info.size; t++) {
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
474 SpanPtr next_span;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
475 int next_span_x;
147
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
476
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
477 span = &spack->span[t];
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
478
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
479 /**
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
480 * span の長さによって、drawLine か drawDot を選択している
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
481 */
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
482 next_span_x
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
483 = (*drawFunc1[(span->length_x != 1)])(
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
484 smanager, g,
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
485 span, rangex_start, rangex_end, tl_tag[tl_tag_flg1]);
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
486 next_span = span;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
487
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
488 resume_span = next_span;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
489 resume_span_x = next_span_x;
148
9642aeef298d Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 147
diff changeset
490
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
491 //smanager->dma_wait(tl_tag[tl_tag_flg1]);
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
492
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
493 tl_tag_flg1 ^= 1;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
494 tl_tag_flg2 ^= 1;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
495 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
496
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
497 // 現在 drawLine2、drawDot2 は機能してないので
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
498 //(this->*drawFunc2[(resume_span->length_x != 1)])(
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
499 //resume_span, rangex_start, rangex_end, resume_span_x,
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
500 //tl_tag[tl_tag_flg1]);
147
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
501
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
502 smanager->dma_wait(SPAN_PACK_LOAD);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
503
352
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
504 SpanPackPtr tmp_spack = spack;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
505 spack = next_spack;
3f5289873643 add global_alloc.h
admin@mb22-no-macbook-2.local
parents: 322
diff changeset
506 next_spack = tmp_spack;
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
507 } while (spack);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
508
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
509 writebuffer(smanager, g, display, rangex, rangey, screen_width);
193
gongo@localhost.localdomain
parents: 192
diff changeset
510
gongo@localhost.localdomain
parents: 192
diff changeset
511 // linebuf は、writebuffer() の dma_store を wait する
gongo@localhost.localdomain
parents: 192
diff changeset
512 // DrawSpan::~DrawSpan() 内で free する。
gongo@localhost.localdomain
parents: 192
diff changeset
513 //free(linebuf);
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
514 free(g->zRow);
184
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 182
diff changeset
515
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
516 //FINISH:
193
gongo@localhost.localdomain
parents: 192
diff changeset
517 /**
gongo@localhost.localdomain
parents: 192
diff changeset
518 * goto FINISH; の時は reboot なので
gongo@localhost.localdomain
parents: 192
diff changeset
519 * linebuf, zRow は free() しない
gongo@localhost.localdomain
parents: 192
diff changeset
520 */
210
204b03ca98f8 fix DrawSpan
gongo@localhost.localdomain
parents: 205
diff changeset
521
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
522 free(free_spack);
469
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
523
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
524 TaskPtr nextTask = smanager->create_task(TASK_DRAW_SPAN_END);
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
525 nextTask->add_param((int)g);
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
526 smanager->wait_task(nextTask);
96c941eae962 fix spe/DrawSpan.cc (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 467
diff changeset
527
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
528 return 0;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
529 }