diff TaskManager/Test/test_render/task/DrawSpanRenew.cpp @ 360:716b87bce32a

add vacuum "-sg 16"
author aaa
date Fri, 17 Jul 2009 22:50:06 +0900
parents b89ba1d96fff
children eab18aa0c7f6
line wrap: on
line diff
--- a/TaskManager/Test/test_render/task/DrawSpanRenew.cpp	Fri Jul 17 17:16:42 2009 +0900
+++ b/TaskManager/Test/test_render/task/DrawSpanRenew.cpp	Fri Jul 17 22:50:06 2009 +0900
@@ -138,12 +138,13 @@
                     tex_localx = tex_xpos % TEXTURE_SPLIT_PIXEL;
                     tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
 
-                    if (!isAvailableTile(tex_addr)) {
-                        set_rgb(tex_addr, 0);
+		    TilePtr tile;
+                    if (!(tile = isAvailableTile(tex_addr))) {
+                        tile = set_rgb(tex_addr, 0);
                         smanager->dma_wait(0);
                     }
 
-                    rgb = get_rgb(tex_localx, tex_localy, tex_addr);
+                    rgb = get_rgb(tex_localx, tex_localy, tile);
 
                     zRow[localx + (rangex*localy)] = zpos;
                     linebuf[localx + (rangex*localy)] = rgb;
@@ -181,21 +182,14 @@
                         tex_localx = tex_xpos % TEXTURE_SPLIT_PIXEL;
                         tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
 
-                        if (!isAvailableTile(tex_addr)) {
+			TilePtr tile;
+                        if (!(tile = isAvailableTile(tex_addr))) {
                             spack->info.start = t;
-#if 0
-                            set_rgbs(tex_addr,
-                                     getTile(span->tex_width-1, tex_ypos,
-                                             span->tex_width, span->tex_addr));
-                            reboot(spack, j);
-                            goto FINISH;
-#else
-                            set_rgb(tex_addr, TEX_LOAD);
+                            tile = set_rgb(tex_addr, TEX_LOAD);
                             smanager->dma_wait(TEX_LOAD);
-#endif
                         }
 
-                        rgb = get_rgb(tex_localx, tex_localy, tex_addr);
+                        rgb = get_rgb(tex_localx, tex_localy, tile);
 
                         zRow[localx + (rangex*localy)] = tex_z;
                         linebuf[localx + (rangex*localy)] = rgb;