From 3ffda80f95478f4e73765f8b7ceb1bbf54ea97ee Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sat, 5 Jan 2013 09:07:16 +0000 Subject: - 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 --- src/gpudataviz.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gpudataviz.cc') 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 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)); -- cgit v1.2.3