Mercurial > hg > Members > kono > Cerium
diff TaskManager/Test/test_render/spe/DrawSpan.cpp @ 266:5c9dbd54cd51
merge
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 04 Jun 2009 00:00:09 +0900 |
| parents | 54787f182881 d949e590da26 |
| children | 7f2b30acf311 |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/spe/DrawSpan.cpp Tue Jan 06 15:30:34 2009 +0900 +++ b/TaskManager/Test/test_render/spe/DrawSpan.cpp Thu Jun 04 00:00:09 2009 +0900 @@ -12,7 +12,19 @@ SchedDefineTask(DrawSpan); +<<<<<<< local static TileHashPtr hash; +======= +<<<<<<< local +static const int hashsize = 263; + +static TilePtr hash_table[hashsize] = {NULL}; + +unsigned short PRIME[8] = { + 0x002, 0x065, 0x0c7, 0x133, 0x191, 0x1f3, 0x259, 0x2bd, +}; + +>>>>>>> other static TileListPtr tileList; /** @@ -72,6 +84,9 @@ int block = get_tex_block(tx, ty, tw); return tex_addr_top + block*TEXTURE_BLOCK_SIZE; } +======= +static unsigned char *tex; +>>>>>>> other void DrawSpan::linebuf_init(int *buf, int x, int rgb) @@ -146,7 +161,16 @@ for (int i = 0; i < rangey; i++) { linebuf[i] = (int*)smanager->get_output(i); +<<<<<<< local linebuf_init(linebuf[i], rangex, 0xffffffff); +======= +<<<<<<< local + linebuf_init(linebuf[i], rangex, 0xffffff); +======= + //linebuf_init(linebuf[i], rangex, 0x00ff00ff); + linebuf_init(linebuf[i], rangex, 0); +>>>>>>> other +>>>>>>> other } do { @@ -258,6 +282,20 @@ free(free_spack); free(linebuf); +<<<<<<< local +======= + free(zRow); +<<<<<<< local +======= +<<<<<<< local + free(tileList); + free(tilist); + free(next_tilist); +>>>>>>> other +>>>>>>> other +======= + free(tex); +>>>>>>> other return 0; }