diff options
| author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2013-01-05 09:07:16 +0000 |
|---|---|---|
| committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2013-01-05 09:07:16 +0000 |
| commit | 3ffda80f95478f4e73765f8b7ceb1bbf54ea97ee (patch) | |
| tree | 1a0e0d62590da225d550ee44da9a76c32a21a6b9 /src/gpudataviz.cc | |
| parent | c1d21f2a47e34362ee1d939bca8ca082f5474b33 (diff) | |
| download | 2013-gpudataviz-3ffda80f95478f4e73765f8b7ceb1bbf54ea97ee.tar.gz 2013-gpudataviz-3ffda80f95478f4e73765f8b7ceb1bbf54ea97ee.tar.bz2 2013-gpudataviz-3ffda80f95478f4e73765f8b7ceb1bbf54ea97ee.zip | |
- Ajout de quelques tests et messages dans compil.sh.
- Suppression des majuscules de my_gtk_gl_scene.h
- Ajout de quelques #define pour pouvoir compiler sans OpenCL
(+ changement appel initOpenCL() -> initLibs() dans gpudataviz.cc)
git-svn-id: file:///var/svn/2013-gpudataviz/trunk@3 371a6b4a-a258-45f8-9dcc-bdd82ce0ac9d
Diffstat (limited to 'src/gpudataviz.cc')
| -rw-r--r-- | src/gpudataviz.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpudataviz.cc b/src/gpudataviz.cc index bcd498e..6f1ebd0 100644 --- a/src/gpudataviz.cc +++ b/src/gpudataviz.cc @@ -3,7 +3,7 @@ #include "gpudataviz.h" #include "boring_parts.h" #include "gtk_win_main.h" -#include "my_GTK_GL_scene.h" +#include "my_gtk_gl_scene.h" // Macro to make things readable in main() function #define EXIT_IF_FAIL(val, expr) do { \ @@ -36,8 +36,8 @@ int main(int argc, char* argv[]) { Glib::RefPtr<Gdk::GL::Config> glconfig; EXIT_IF_FAIL(2, glconfig=Gdk::GL::Config::create(glMode) ); - // Initialize OpenCL - EXIT_IF_FAIL(3, initOpenCL()==0 ); // See boring_parts.cc + // Initialize OpenCL (if available) + EXIT_IF_FAIL(3, initLibs()==0 ); // See boring_parts.cc // Initialize host work memory (array for all the vertex coordinates computed by OpenCL and displayed by OpenGL) cl_float4 *hostWorkMem = (cl_float4 *) calloc(meshWidth * meshHeight, sizeof(cl_float4)); |