summaryrefslogtreecommitdiff
path: root/src/boring_parts.h
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2013-03-02 20:20:32 +0000
committerLudovic Pouzenc <ludovic@pouzenc.fr>2013-03-02 20:20:32 +0000
commit8c587d2243884d85bbe5fadac64258ac246617b4 (patch)
treee944cd0223fef39a062a8abdf3ab0db8c621f60f /src/boring_parts.h
parent5fdcb39c0171c48207063a81ddbcaa553f1b2969 (diff)
download2013-gpudataviz-8c587d2243884d85bbe5fadac64258ac246617b4.tar.gz
2013-gpudataviz-8c587d2243884d85bbe5fadac64258ac246617b4.tar.bz2
2013-gpudataviz-8c587d2243884d85bbe5fadac64258ac246617b4.zip
Version C++ qui arrive a initialiser OpenCL sans trop de merdouilles specifiques.
Un dur labeur... Reste à retourner les pointeurs où il faut, faire la partie VBO, l'affichage du VBO et lancer un premier kernel git-svn-id: file:///var/svn/2013-gpudataviz/trunk@16 371a6b4a-a258-45f8-9dcc-bdd82ce0ac9d
Diffstat (limited to 'src/boring_parts.h')
-rw-r--r--src/boring_parts.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/boring_parts.h b/src/boring_parts.h
index 54fd7b3..b4cd58d 100644
--- a/src/boring_parts.h
+++ b/src/boring_parts.h
@@ -2,18 +2,18 @@
#include <gtkmm.h> /* Must included before X11/Xlib.h */
//#include <GL/glew.h> /* Seems included by GL/glxew.h */
-#include <GL/glxew.h> /* For GLXContext, must appear before gl.h, includes X11/Xlib.h */
+//#include <GL/glxew.h> /* For GLXContext, must appear before gl.h, includes X11/Xlib.h */
#include <gtkglmm.h> /* Includes a GL/gl.h (the right one ??) */
//#include <GL/gl.h>
-//#include <GL/glu.h>
+#include <GL/glu.h>
//#include <CL/cl_gl.h>
int initLibs();
#ifdef HAS_OPENCL
#include <CL/opencl.h>
-int initOpenCL();
+int initOpenCL(intptr_t gl_display, intptr_t gl_context, intptr_t gl_vbo);
#else
// Quick and dirty cl_float4 replacement
typedef union {