projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RayTracing.
[GPU.git]
/
WCudaMSE
/
Student_Cuda_Image
/
src
/
cpp
/
main.cpp
diff --git
a/WCudaMSE/Student_Cuda_Image/src/cpp/main.cpp
b/WCudaMSE/Student_Cuda_Image/src/cpp/main.cpp
index
5e56e8a
..
46fbbce
100755
(executable)
--- a/
WCudaMSE/Student_Cuda_Image/src/cpp/main.cpp
+++ b/
WCudaMSE/Student_Cuda_Image/src/cpp/main.cpp
@@
-46,7
+46,7
@@
int main(int argc, char** argv)
cout << "main" << endl;
if (Device::isCuda())
cout << "main" << endl;
if (Device::isCuda())
- {
+
{
GLUTImageViewers::init(argc, argv);
//Device::printAll();
GLUTImageViewers::init(argc, argv);
//Device::printAll();
@@
-54,7
+54,8
@@
int main(int argc, char** argv)
// Server Cuda1: in [0,5]
// Server Cuda2: in [0,2]
// Server Cuda1: in [0,5]
// Server Cuda2: in [0,2]
- int deviceId = 0;
+ const int deviceId = 5;
+ initCuda(deviceId);
vector<string> args;
for (int i = 1; i < argc; ++i)
vector<string> args;
for (int i = 1; i < argc; ++i)
@@
-106,7
+107,7
@@
int start(const vector<string>& args)
if (IS_GL)
{
if (IS_GL)
{
- return mainGL(args); // Bloquant, Tant qu'une fen
etre est ouverte
+ return mainGL(args); // Bloquant, Tant qu'une fen
ĂȘtre est ouverte.
}
else
{
}
else
{