Mercurial > hg > Members > kono > Cerium
diff TaskManager/Test/test_render/spe/DrawSpan.cpp @ 264:a59868d37093
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 |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/spe/DrawSpan.cpp Tue Dec 02 19:14:52 2008 +0900 +++ b/TaskManager/Test/test_render/spe/DrawSpan.cpp Wed Jun 03 23:57:38 2009 +0900 @@ -12,6 +12,7 @@ SchedDefineTask(DrawSpan); +<<<<<<< local static const int hashsize = 263; static TilePtr hash_table[hashsize] = {NULL}; @@ -71,6 +72,9 @@ return NULL; } +======= +static unsigned char *tex; +>>>>>>> other void DrawSpan::linebuf_init(int *buf, int x, int rgb) @@ -205,7 +209,12 @@ for (int i = 0; i < rangey; i++) { linebuf[i] = (int*)smanager->get_output(i); +<<<<<<< local linebuf_init(linebuf[i], rangex, 0xffffff); +======= + //linebuf_init(linebuf[i], rangex, 0x00ff00ff); + linebuf_init(linebuf[i], rangex, 0); +>>>>>>> other } bzero(hash_table, sizeof(TilePtr)*hashsize); @@ -374,9 +383,13 @@ free(free_sp); free(linebuf); free(zRow); +<<<<<<< local free(tileList); free(tilist); free(next_tilist); +======= + free(tex); +>>>>>>> other return 0; }