Mercurial > hg > Game > Cerium

changeset 1529:504a76847b85 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove SDL
author Yuhi TOMARI <yuhi@cr.ie.u-ryukyu.ac.jp>
date Sun, 25 Nov 2012 21:10:50 +0900
parents 360b424125ea
children c7f0e6eb1d50
files TaskManager/Gpu/GpuScheduler.cc TaskManager/kernel/main.cc TaskManager/test/GpuRunTest/Makefile
diffstat 3 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Gpu/GpuScheduler.cc	Tue Nov 20 15:44:17 2012 +0900
+++ b/TaskManager/Gpu/GpuScheduler.cc	Sun Nov 25 21:10:50 2012 +0900
@@ -142,22 +142,22 @@
             }
 
             reply[cur] = (memaddr)tasklist->waiter;
-            clFlush(command_queue[cur]); // waiting for queued task
+            clFlush(command_queue[1-cur]); // waiting for queued task
             //clFinish(command_queue[cur]); // waiting for queued task
             // pipeline    : 1-cur
             // no pipeline : cur
 
-            if(reply[cur]) {
-                connector->mail_write(reply[cur]);
+            if(reply[1-cur]) {
+                connector->mail_write(reply[1-cur]);
             }
 
             params_addr = (memaddr)tasklist->next;
             cur = 1 - cur;
         }
-        /*
+
           clFlush(command_queue[1-cur]); // waiting for queued task
           connector->mail_write(reply[1-cur]);
-        */
+
 
         connector->mail_write((memaddr)MY_SPE_STATUS_READY);
     }
--- a/TaskManager/kernel/main.cc	Tue Nov 20 15:44:17 2012 +0900
+++ b/TaskManager/kernel/main.cc	Sun Nov 25 21:10:50 2012 +0900
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include <SDL.h>
+// #include <SDL.h>
 #include "TaskManager.h"
 
 /*!
@@ -49,7 +49,7 @@
             speIdle = atoi(argv[++i]);
         } else if (strcmp(argv[i], "-copy") == 0) { // force copy DMA in FifoManager
             useRefDma |= 0x01;
-        } else if (strcmp(argv[i], "-pre") == 0) {  // deplicated 
+        } else if (strcmp(argv[i], "-pre") == 0) {  // deplicated
             useRefDma |= 0x10;
         }
     }
@@ -61,25 +61,25 @@
 
     for (int i = 1; argv[i]; ++i) {
         if (strcmp(argv[i], "-help") == 0) {
-	  if (usr_help_str) {
-	    manager->get_scheduler()->printf("%s", usr_help_str);
-	  }
-	  manager->get_scheduler()->printf("%s", help_str);	    
-	  return EXIT_SUCCESS;
+          if (usr_help_str) {
+            manager->get_scheduler()->printf("%s", usr_help_str);
+          }
+          manager->get_scheduler()->printf("%s", help_str);
+          return EXIT_SUCCESS;
         }
     }
 
     if (profile)
-	manager->start_profile();
+        manager->start_profile();
     if (TMmain(manager, argc, argv) < 0) {
-	goto FINISH;
+        goto FINISH;
     }
 
     manager->run();
 
     (manager->tm_end)(manager);
     if (profile)
-	manager->show_profile();
+        manager->show_profile();
     if (export_task_log)
         manager->export_task_log();
 
--- a/TaskManager/test/GpuRunTest/Makefile	Tue Nov 20 15:44:17 2012 +0900
+++ b/TaskManager/test/GpuRunTest/Makefile	Sun Nov 25 21:10:50 2012 +0900
@@ -5,7 +5,7 @@
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
 OBJS = $(SRCS:.cc=.o)
 
-LIBS += -lGpuManager -framework opencl `sdl-config --libs`
+LIBS += -lGpuManager -framework opencl # `sdl-config --libs`
 
 .SUFFIXES: .cc .o