Mercurial > hg > Members > kono > Cerium

changeset 825:865508d81299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author yutaka@localhost.localdomain
date Mon, 24 May 2010 23:53:06 +0900
parents 3468641f22d7 (current diff) 01b6d924a560 (diff)
children a6a6cd8d8499 da49d9e458dc
files
diffstat 6 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/spe/DataLoad.cc	Mon May 24 23:51:40 2010 +0900
+++ b/Renderer/Engine/spe/DataLoad.cc	Mon May 24 23:53:06 2010 +0900
@@ -10,8 +10,8 @@
 run(SchedTask *s, void *rbuf, void *wbuf)
 {
 
-  int size = (int)s->get_param(0);
-  int load_id = (int)s->get_param(1);
+  long size = (long)s->get_param(0);
+  long load_id = (long)s->get_param(1);
 
   s->global_alloc(load_id, size);
 
--- a/Renderer/Engine/spe/DataUpdate.cc	Mon May 24 23:51:40 2010 +0900
+++ b/Renderer/Engine/spe/DataUpdate.cc	Mon May 24 23:53:06 2010 +0900
@@ -11,8 +11,8 @@
 {
 
   void *idata = (void*)s->get_input(rbuf, 0);
-  int size = (int)s->get_param(0);
-  int load_id = (int)s->get_param(1);
+  long size = (long)s->get_param(0);
+  long load_id = (long)s->get_param(1);
   void *global_data = (void*)s->global_get(load_id);
 
   memcpy(global_data,idata,size);
--- a/Renderer/Engine/task/DataLoad.cc	Mon May 24 23:51:40 2010 +0900
+++ b/Renderer/Engine/task/DataLoad.cc	Mon May 24 23:53:06 2010 +0900
@@ -10,8 +10,8 @@
 run(SchedTask *s, void *rbuf, void *wbuf)
 {
 
-  int size = (int)s->get_param(0);
-  int load_id = (int)s->get_param(1);
+  long size = (long)s->get_param(0);
+  long load_id = (long)s->get_param(1);
 
   //printf("size %d",sizeof(float)*length);
 
--- a/Renderer/Engine/task/DataUpdate.cc	Mon May 24 23:51:40 2010 +0900
+++ b/Renderer/Engine/task/DataUpdate.cc	Mon May 24 23:53:06 2010 +0900
@@ -10,8 +10,8 @@
 run(SchedTask *s, void *rbuf, void *wbuf)
 {
   void *idata = (void*)s->get_input(rbuf, 0);
-  int size = (int)s->get_param(0);
-  int load_id = (int)s->get_param(1);
+  long size = (long)s->get_param(0);
+  long load_id = (long)s->get_param(1);
   void *global_data = (void*)s->global_get(load_id);
   
   memcpy(global_data,idata,size);
--- a/Renderer/Engine/task/ExecMove.cc	Mon May 24 23:51:40 2010 +0900
+++ b/Renderer/Engine/task/ExecMove.cc	Mon May 24 23:53:06 2010 +0900
@@ -12,8 +12,8 @@
     SgChange *sgchange = (SgChange *)smanager->get_param(0);
     //SceneGraphRoot *sgroot = (SceneGraphRoot *)smanager->get_param(0);
     SceneGraphRoot *sgroot = sgchange->sgroot_A;
-    int screen_w = (int)smanager->get_param(1);
-    int screen_h = (int)smanager->get_param(2);
+    long screen_w = (long)smanager->get_param(1);
+    long screen_h = (long)smanager->get_param(2);
 
     //sgroot->updateControllerState();
 
--- a/Renderer/Engine/task/RunMove.cc	Mon May 24 23:51:40 2010 +0900
+++ b/Renderer/Engine/task/RunMove.cc	Mon May 24 23:53:06 2010 +0900
@@ -10,8 +10,8 @@
 {
     //SceneGraphRoot *sgroot = (SceneGraphRoot *)smanager->get_param(0);    
     SgChange *sgchange = (SgChange *)smanager->get_param(0);
-    int width  = (int)smanager->get_param(1);
-    int height = (int)smanager->get_param(2);
+    long width  = (long)smanager->get_param(1);
+    long height = (long)smanager->get_param(2);
     SceneGraphRoot *sgroot = sgchange->sgroot_A;
     sgroot->updateControllerState();
     sgroot->oneExecute(width, height);