Mercurial > hg > Game > Cerium
changeset 1615:2c6e9ed9db3b draft
merge
author | Shohei KOKUBO <e105744@ie.u-ryukyu.ac.jp> |
---|---|
date | Tue, 14 May 2013 13:38:17 +0900 |
parents | 93569219173e |
children | 05d449e7b9f8 |
files | TaskManager/Gpu/GpuScheduler.h example/basic/main.cc |
diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Gpu/GpuScheduler.h Fri May 10 01:19:13 2013 +0900 +++ b/TaskManager/Gpu/GpuScheduler.h Tue May 14 13:38:17 2013 +0900 @@ -40,7 +40,6 @@ cl_context context; cl_command_queue command_queue; cl_int ret; - ND_RANGE_T_PTR ndr; private: FifoDmaManager *fifoDmaManager; void load_kernel(int cmd);
--- a/example/basic/main.cc Fri May 10 01:19:13 2013 +0900 +++ b/example/basic/main.cc Tue May 14 13:38:17 2013 +0900 @@ -91,10 +91,10 @@ /* * set_post() で ppe task を渡せるようにしたい */ - twice->set_post(twice_result, (void*)data, 0); // add Active Queue twice->iterate(length); + twice->set_post(twice_result, (void*)data, 0); }