Mercurial > hg > Members > kono > Cerium

comparison TaskManager/Test/test_render/spe/DrawSpan.cpp @ 264:a59868d37093

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 151 263
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 03 Jun 2009 23:57:38 +0900
parents 9642aeef298d a802b19ab9ae
children d949e590da26
comparison
equal deleted inserted replaced
151:5179a90fb610 264:a59868d37093
10 #define TEX_LOAD 1 10 #define TEX_LOAD 1
11 #define TILE_INFO_LOAD 2 11 #define TILE_INFO_LOAD 2
12 12
13 SchedDefineTask(DrawSpan); 13 SchedDefineTask(DrawSpan);
14 14
15 <<<<<<< local
15 static const int hashsize = 263; 16 static const int hashsize = 263;
16 17
17 static TilePtr hash_table[hashsize] = {NULL}; 18 static TilePtr hash_table[hashsize] = {NULL};
18 19
19 unsigned short PRIME[8] = { 20 unsigned short PRIME[8] = {
69 } 70 }
70 } 71 }
71 72
72 return NULL; 73 return NULL;
73 } 74 }
75 =======
76 static unsigned char *tex;
77 >>>>>>> other
74 78
75 void 79 void
76 DrawSpan::linebuf_init(int *buf, int x, int rgb) 80 DrawSpan::linebuf_init(int *buf, int x, int rgb)
77 { 81 {
78 for (int i = 0; i < x; i++) { 82 for (int i = 0; i < x; i++) {
203 207
204 int **linebuf = (int**)smanager->allocate(sizeof(int*)*rangey); 208 int **linebuf = (int**)smanager->allocate(sizeof(int*)*rangey);
205 209
206 for (int i = 0; i < rangey; i++) { 210 for (int i = 0; i < rangey; i++) {
207 linebuf[i] = (int*)smanager->get_output(i); 211 linebuf[i] = (int*)smanager->get_output(i);
212 <<<<<<< local
208 linebuf_init(linebuf[i], rangex, 0xffffff); 213 linebuf_init(linebuf[i], rangex, 0xffffff);
214 =======
215 //linebuf_init(linebuf[i], rangex, 0x00ff00ff);
216 linebuf_init(linebuf[i], rangex, 0);
217 >>>>>>> other
209 } 218 }
210 219
211 bzero(hash_table, sizeof(TilePtr)*hashsize); 220 bzero(hash_table, sizeof(TilePtr)*hashsize);
212 221
213 do { 222 do {
372 } while (sp); 381 } while (sp);
373 382
374 free(free_sp); 383 free(free_sp);
375 free(linebuf); 384 free(linebuf);
376 free(zRow); 385 free(zRow);
386 <<<<<<< local
377 free(tileList); 387 free(tileList);
378 free(tilist); 388 free(tilist);
379 free(next_tilist); 389 free(next_tilist);
380 390
391 =======
392 free(tex);
393 >>>>>>> other
381 return 0; 394 return 0;
382 } 395 }