# HG changeset patch
# User Yutaka_Kinjyo
# Date 1297907753 -32400
# Node ID 068c1af8c7a92910b414ca28e8a7b7051bd25960
# Parent  f326494ffdc7408bbe8142d81ecad80f69b38c14# Parent  8142e652ea4caf9091519651662ab90377e40b9f
merge

diff -r f326494ffdc7 -r 068c1af8c7a9 Renderer/Engine/Makefile.def
--- a/Renderer/Engine/Makefile.def	Thu Feb 17 10:50:40 2011 +0900
+++ b/Renderer/Engine/Makefile.def	Thu Feb 17 10:55:53 2011 +0900
@@ -5,7 +5,8 @@
 ABIBIT = 64 
 ABI = -m$(ABIBIT)
 CC      = g++
-OPT	=  -g #-O9 
+OPT	=  -g 
+
 CFLAGS  = -Wall $(ABI) $(OPT)  #  -DDEBUG
 
 INCLUDE = -I$(CERIUM)/include/TaskManager -I.
diff -r f326494ffdc7 -r 068c1af8c7a9 Renderer/Engine/TextureHash.cc
--- a/Renderer/Engine/TextureHash.cc	Thu Feb 17 10:50:40 2011 +0900
+++ b/Renderer/Engine/TextureHash.cc	Thu Feb 17 10:55:53 2011 +0900
@@ -2,12 +2,10 @@
 #include <stdlib.h>
 #include "TextureHash.h"
 
-static int id_count;
-
 TextureHash::TextureHash(void)
 {
+	id_count = 0;
     int size = sizeof(hashtable)*TABLE_SIZE;
-
 #if defined(__SPU__) || ! defined(HAS_POSIX_MEMALIGN)
         table =  (hashtable*)malloc(size);
 #else
diff -r f326494ffdc7 -r 068c1af8c7a9 Renderer/Engine/TextureHash.h
--- a/Renderer/Engine/TextureHash.h	Thu Feb 17 10:50:40 2011 +0900
+++ b/Renderer/Engine/TextureHash.h	Thu Feb 17 10:55:53 2011 +0900
@@ -10,6 +10,7 @@
 
 class TextureHash {
 public:
+	int id_count;
     hashtable *table;
 
     TextureHash(void);
diff -r f326494ffdc7 -r 068c1af8c7a9 TaskManager/kernel/schedule/Scheduler.h
--- a/TaskManager/kernel/schedule/Scheduler.h	Thu Feb 17 10:50:40 2011 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.h	Thu Feb 17 10:55:53 2011 +0900
@@ -12,7 +12,7 @@
 #include "MemHash.h"
 
 
-#define MAX_USER_TASK 32
+#define MAX_USER_TASK 100
 #define MAX_SYSTEM_TASK 2
 #define MAX_TASK_OBJECT MAX_USER_TASK + MAX_SYSTEM_TASK
 #define MAX_GLOBAL_AREA 32