Mercurial > hg > Members > kono > Cerium

changeset 186:f7ad032575ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author gongo@localhost.localdomain
date Tue, 06 Jan 2009 16:18:37 +0900
parents bdc08777197e
children ac52c139ad45
files TaskManager/Makefile.def TaskManager/Test/test_render/Makefile.def TaskManager/Test/test_render/Tapestry.h TaskManager/Test/test_render/spe/DrawSpan.cpp TaskManager/Test/test_render/spe/DrawSpanRenew.cpp TaskManager/Test/test_render/spe/Makefile TaskManager/Test/test_render/task/DrawSpan.cpp TaskManager/Test/test_render/task/DrawSpanRenew.cpp
diffstat 8 files changed, 51 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Makefile.def	Tue Jan 06 15:40:15 2009 +0900
+++ b/TaskManager/Makefile.def	Tue Jan 06 16:18:37 2009 +0900
@@ -25,7 +25,7 @@
 IMPL_CELL_OBJS = $(IMPL_CELL_SRCS:.cc=.o)
 
 CC     = g++   
-CFLAGS = -O0 -Wall `sdl-config --cflags` -g
+CFLAGS = -O9 -Wall `sdl-config --cflags` -g
 LIBS   = 
 
 INCLUDE = -I../include/TaskManager
\ No newline at end of file
--- a/TaskManager/Test/test_render/Makefile.def	Tue Jan 06 15:40:15 2009 +0900
+++ b/TaskManager/Test/test_render/Makefile.def	Tue Jan 06 16:18:37 2009 +0900
@@ -3,10 +3,10 @@
 # include/library path
 # ex: macosx
 #CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
-CERIUM = /Users/gongo/Source/hg/Cerium
+#CERIUM = /Users/gongo/Source/hg/Cerium
 
 # ex: linux/ps3
-#CERIUM = /home/gongo/Cerium
+CERIUM = /home/gongo/Cerium
 #CERIUM = /Users/tkaito/hg/Game/Cerium
 
 #CERIUM = ../../..
--- a/TaskManager/Test/test_render/Tapestry.h	Tue Jan 06 15:40:15 2009 +0900
+++ b/TaskManager/Test/test_render/Tapestry.h	Tue Jan 06 16:18:37 2009 +0900
@@ -86,7 +86,7 @@
     int pad[3];
 } Tile, *TilePtr;
 
-#define MAX_TILE 128
+#define MAX_TILE 64
 
 /**
  * TileList 中の Tile の追い出しは、現在 FIFO で実装している
--- a/TaskManager/Test/test_render/spe/DrawSpan.cpp	Tue Jan 06 15:40:15 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpan.cpp	Tue Jan 06 16:18:37 2009 +0900
@@ -283,12 +283,12 @@
 		     */
 		    if (!isAvailableTile(tex_addr)) {
 			spack->info.start = t;
-			//set_rgb(tex_addr);
-			set_rgbs(tex_addr,
-				 getTile(span->tex_width-1, tex_ypos,
-					 span->tex_width, span->tex_addr));
-			reboot(spack, 0);
-			goto FINISH;
+			set_rgb(tex_addr);
+			//set_rgbs(tex_addr,
+			//getTile(span->tex_width-1, tex_ypos,
+			//span->tex_width, span->tex_addr));
+			//reboot(spack, 0);
+			//goto FINISH;
 		    }
 
 		    rgb = get_rgb(tex_localx, tex_localy, tex_addr);
@@ -351,6 +351,7 @@
 FINISH:
     free(free_spack);
     free(linebuf);
+    free(zRow);
 
     return 0;
 }
--- a/TaskManager/Test/test_render/spe/DrawSpanRenew.cpp	Tue Jan 06 15:40:15 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpanRenew.cpp	Tue Jan 06 16:18:37 2009 +0900
@@ -114,12 +114,12 @@
 		     */
 		    if (!isAvailableTile(tex_addr)) {
 			spack->info.start = t;
-			//set_rgb(tex_addr);
-			set_rgbs(tex_addr,
-				 getTile(span->tex_width-1, tex_ypos,
-					 span->tex_width, span->tex_addr));
-			reboot(spack, 0);
-			goto FINISH;
+			set_rgb(tex_addr);
+			//set_rgbs(tex_addr,
+			//getTile(span->tex_width-1, tex_ypos,
+			//span->tex_width, span->tex_addr));
+			//reboot(spack, 0);
+			//goto FINISH;
 		    }
 		    
 		    rgb = get_rgb(tex_localx, tex_localy, tex_addr);
@@ -161,14 +161,13 @@
 			tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
 
 			if (!isAvailableTile(tex_addr)) {
-			    printf("empty\n");
 			    spack->info.start = t;
-			    //set_rgb(tex_addr);
-			    set_rgbs(tex_addr,
-				     getTile(span->tex_width-1, tex_ypos,
-					     span->tex_width, span->tex_addr));
-			    reboot(spack, j);
-			    goto FINISH;
+			    set_rgb(tex_addr);
+			    //set_rgbs(tex_addr,
+			    //getTile(span->tex_width-1, tex_ypos,
+			    //span->tex_width, span->tex_addr));
+			    //reboot(spack, j);
+			    //goto FINISH;
 			}
 			
 			rgb = get_rgb(tex_localx, tex_localy, tex_addr);
@@ -189,9 +188,12 @@
 
 
 FINISH:
-    free(spack);
     free(next_spack);
     free(linebuf);
+    free(zRow);
+
+    // Renew  allocate 줿ΤʤΤǡ free
+    free(spack);
 
     return 0;
 }
--- a/TaskManager/Test/test_render/spe/Makefile	Tue Jan 06 15:40:15 2009 +0900
+++ b/TaskManager/Test/test_render/spe/Makefile	Tue Jan 06 16:18:37 2009 +0900
@@ -8,7 +8,7 @@
 OBJS = $(SRCS:.cpp=.o)
 
 CC      = spu-g++
-CFLAGS  = -O9 -Wall -g -fno-exceptions -fno-rtti #-DDEBUG
+CFLAGS  = -O0 -Wall -g -fno-exceptions -fno-rtti #-DDEBUG
 INCLUDE = -I$(CERIUM)/include/TaskManager -I. -I..
 LIBS    = -L$(CERIUM)/TaskManager -lspemanager
 
--- a/TaskManager/Test/test_render/task/DrawSpan.cpp	Tue Jan 06 15:40:15 2009 +0900
+++ b/TaskManager/Test/test_render/task/DrawSpan.cpp	Tue Jan 06 16:18:37 2009 +0900
@@ -283,12 +283,12 @@
 		     */
 		    if (!isAvailableTile(tex_addr)) {
 			spack->info.start = t;
-			//set_rgb(tex_addr);
-			set_rgbs(tex_addr,
-				 getTile(span->tex_width-1, tex_ypos,
-					 span->tex_width, span->tex_addr));
-			reboot(spack, 0);
-			goto FINISH;
+			set_rgb(tex_addr);
+			//set_rgbs(tex_addr,
+			//getTile(span->tex_width-1, tex_ypos,
+			//span->tex_width, span->tex_addr));
+			//reboot(spack, 0);
+			//goto FINISH;
 		    }
 
 		    rgb = get_rgb(tex_localx, tex_localy, tex_addr);
@@ -351,6 +351,7 @@
 FINISH:
     free(free_spack);
     free(linebuf);
+    free(zRow);
 
     return 0;
 }
--- a/TaskManager/Test/test_render/task/DrawSpanRenew.cpp	Tue Jan 06 15:40:15 2009 +0900
+++ b/TaskManager/Test/test_render/task/DrawSpanRenew.cpp	Tue Jan 06 16:18:37 2009 +0900
@@ -114,12 +114,12 @@
 		     */
 		    if (!isAvailableTile(tex_addr)) {
 			spack->info.start = t;
-			//set_rgb(tex_addr);
-			set_rgbs(tex_addr,
-				 getTile(span->tex_width-1, tex_ypos,
-					 span->tex_width, span->tex_addr));
-			reboot(spack, 0);
-			goto FINISH;
+			set_rgb(tex_addr);
+			//set_rgbs(tex_addr,
+			//getTile(span->tex_width-1, tex_ypos,
+			//span->tex_width, span->tex_addr));
+			//reboot(spack, 0);
+			//goto FINISH;
 		    }
 		    
 		    rgb = get_rgb(tex_localx, tex_localy, tex_addr);
@@ -161,14 +161,13 @@
 			tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
 
 			if (!isAvailableTile(tex_addr)) {
-			    printf("empty\n");
 			    spack->info.start = t;
-			    //set_rgb(tex_addr);
-			    set_rgbs(tex_addr,
-				     getTile(span->tex_width-1, tex_ypos,
-					     span->tex_width, span->tex_addr));
-			    reboot(spack, j);
-			    goto FINISH;
+			    set_rgb(tex_addr);
+			    //set_rgbs(tex_addr,
+			    //getTile(span->tex_width-1, tex_ypos,
+			    //span->tex_width, span->tex_addr));
+			    //reboot(spack, j);
+			    //goto FINISH;
 			}
 			
 			rgb = get_rgb(tex_localx, tex_localy, tex_addr);
@@ -189,9 +188,12 @@
 
 
 FINISH:
-    free(spack);
     free(next_spack);
     free(linebuf);
+    free(zRow);
+
+    // Renew  allocate 줿ΤʤΤǡ free
+    free(spack);
 
     return 0;
 }