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/boring_parts.h | |
| 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/boring_parts.h')
| -rw-r--r-- | src/boring_parts.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/boring_parts.h b/src/boring_parts.h index fc4e09b..431a46f 100644 --- a/src/boring_parts.h +++ b/src/boring_parts.h @@ -1,8 +1,16 @@ #include <iostream> + +#ifdef HAS_OPENCL #include <CL/opencl.h> -#include "gtk_includes.h" +int initOpenCL(); +#else +// Quick and dirty cl_float4 replacement +typedef union { + float s[4]; + struct{ float x, y, z, w; }; + struct{ float s0, s1, s2, s3; }; +} cl_float4; +#endif /*HAS_OPENCL*/ int initLibs(); -int initOpenCL(); -int initGTK(); |