Mercurial > hg > Members > kono > Cerium
changeset 61:6bc72fde6615
*** empty log message ***
| author | gongo |
|---|---|
| date | Sat, 16 Feb 2008 20:19:31 +0900 |
| parents | f50c74835a9b |
| children | b03e4cb64302 |
| files | TaskManager/Cell/CellTaskManagerImpl.cc TaskManager/Cell/spe/CellDmaManager.cc TaskManager/Cell/spe/CellScheduler.cc TaskManager/Makefile.cell TaskManager/Test/simple_render/Makefile TaskManager/Test/simple_render/base64_de.cpp TaskManager/Test/simple_render/task/create_sgp.cpp include/TaskManager/CellTaskManagerImpl.h |
| diffstat | 8 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/CellTaskManagerImpl.cc Sat Feb 16 20:05:35 2008 +0900 +++ b/TaskManager/Cell/CellTaskManagerImpl.cc Sat Feb 16 20:19:31 2008 +0900 @@ -2,6 +2,7 @@ #include <stdlib.h> #include <string.h> #include "CellTaskManagerImpl.h" +#include "CellBufferManager.h" #include "types.h" void
--- a/TaskManager/Cell/spe/CellDmaManager.cc Sat Feb 16 20:05:35 2008 +0900 +++ b/TaskManager/Cell/spe/CellDmaManager.cc Sat Feb 16 20:19:31 2008 +0900 @@ -1,3 +1,4 @@ +#include <stdio.h> #include <spu_mfcio.h> #include "CellDmaManager.h"
--- a/TaskManager/Cell/spe/CellScheduler.cc Sat Feb 16 20:05:35 2008 +0900 +++ b/TaskManager/Cell/spe/CellScheduler.cc Sat Feb 16 20:19:31 2008 +0900 @@ -4,7 +4,7 @@ #include "error.h" void -CellScheduler::init(MailManager *m) +CellScheduler::init_impl(void) { connector = new CellDmaManager;
--- a/TaskManager/Makefile.cell Sat Feb 16 20:05:35 2008 +0900 +++ b/TaskManager/Makefile.cell Sat Feb 16 20:19:31 2008 +0900 @@ -12,12 +12,12 @@ PPE_ALL_OBJS = $(KERN_PPE_OBJS) $(KERN_SCHED_OBJS) $(IMPL_CELL_OBJS) $(TARGET): $(PPE_ALL_OBJS) - ar crus $@ $(ALL_OBJS) + ar crus $@ $(PPE_ALL_OBJS) $(PPE_ALL_OBJS): %.o : %.cpp $(CC) $(CFLAGS) $(SPUCFLAGS) $(INCLUDE) -c $< -o $@ spe: $(CELL_SPE_OBJS) -$(CELL_SPE_OBJS): %.o %.cpp +$(CELL_SPE_OBJS): %.o : %.cpp $(SPUCC) $(CFLAGS) $(INCLUDE) -c $< -o $@ \ No newline at end of file
--- a/TaskManager/Test/simple_render/Makefile Sat Feb 16 20:05:35 2008 +0900 +++ b/TaskManager/Test/simple_render/Makefile Sat Feb 16 20:19:31 2008 +0900 @@ -13,9 +13,9 @@ EXTRA_CFLAGS = `sdl-config --cflags` `xml2-config --cflags`\ -LIBS = `sdl-config --libs` -lSDL_image -Wl,-framework,OpenGL \ +LIBS = `sdl-config --libs` -lSDL_image -lGL \ `xml2-config --libs`\ - -L../../ -lmanager + -L../../ -lmanager -lspe2 -lpthread .SUFFIXES: .cpp .o
--- a/TaskManager/Test/simple_render/base64_de.cpp Sat Feb 16 20:05:35 2008 +0900 +++ b/TaskManager/Test/simple_render/base64_de.cpp Sat Feb 16 20:19:31 2008 +0900 @@ -1,4 +1,5 @@ -#include <iostream> +#include <stdio.h> +//#include <iostream> #include <fstream> using namespace std;
--- a/TaskManager/Test/simple_render/task/create_sgp.cpp Sat Feb 16 20:05:35 2008 +0900 +++ b/TaskManager/Test/simple_render/task/create_sgp.cpp Sat Feb 16 20:19:31 2008 +0900 @@ -1,4 +1,4 @@ -#include <iostream> +//#include <iostream> #include "scene_graph_pack.h" #include "polygon.h" using namespace std;
--- a/include/TaskManager/CellTaskManagerImpl.h Sat Feb 16 20:05:35 2008 +0900 +++ b/include/TaskManager/CellTaskManagerImpl.h Sat Feb 16 20:19:31 2008 +0900 @@ -1,6 +1,9 @@ #ifndef INCLUDED_CELL_TASK_MANAGER_IMPL #define INCLUDED_CELL_TASK_MANAGER_IMPL +#include <libspe2.h> +#include <pthread.h> + #ifndef INCLUDED_TASK_MANAGER_IMPL # include "TaskManagerImpl.h" #endif