annotate TaskManager/Test/test_render/spe/DrawSpan.cpp @ 387:5e2d30bfbf23

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