Mercurial > hg > Game > Cerium
diff TaskManager/Test/test_render/spe/DrawSpan.cpp @ 356:5b995810b86a draft
merge heads
| author | aaa |
|---|---|
| date | Fri, 17 Jul 2009 15:04:02 +0900 |
| parents | cfd20d609ace 9738837c225c |
| children | 6602b9ba4bfd |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/spe/DrawSpan.cpp Wed Jul 15 19:21:49 2009 +0900 +++ b/TaskManager/Test/test_render/spe/DrawSpan.cpp Fri Jul 17 15:04:02 2009 +0900 @@ -180,10 +180,10 @@ uint32 old_addr = tile->texture_addr; smanager->dma_load(tile->pixel, (uint32)addr, sizeof(uint32)*TEXTURE_BLOCK_SIZE, tag); - /** * FIFO なので、もし前のが残っていれば削除 */ + hash->remove(old_addr); tile->texture_addr = addr; @@ -193,7 +193,6 @@ return tile; } - uint32 DrawSpan::get_rgb(int tx, int ty, TilePtr tile) { @@ -337,7 +336,7 @@ } updateBuffer(zpos, rangex, localx, localy, - tex_localx, tex_localy, tile); + tex_localx, tex_localy, tile); } return -1; @@ -421,15 +420,14 @@ tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL; TilePtr tile; - if (!(tile = isAvailableTile(tex_addr))) { - + if (!(tile = isAvailableTile(tex_addr))) { tile = set_rgb(tex_addr, wait_tag); smanager->dma_wait(wait_tag); + } - } updateBuffer(tex_z, rangex, localx, localy, - tex_localx, tex_localy, tile); + tex_localx, tex_localy, tile); } }