summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2009-09-18 15:55:10 +0200
committerMichael Bien <[email protected]>2009-09-18 15:55:10 +0200
commitd31496fc6c4d1e246cfd53beb438312d16f8d582 (patch)
tree4fda23ea656802a06c00769e83a424ed6cb7913a /resources
parent105aa6ed86d452245007cbfd36e712d4d5c66fa3 (diff)
added cl-gl3 binding
Diffstat (limited to 'resources')
-rw-r--r--resources/CL/cl.h (renamed from resources/cl.h)0
-rw-r--r--resources/CL/cl_gl.h (renamed from resources/cl_gl.h)0
-rw-r--r--resources/OpenCL.cfg1
-rw-r--r--resources/gltypes.h18
-rw-r--r--resources/opencl.h (renamed from resources/CL/opencl.h)3
5 files changed, 21 insertions, 1 deletions
diff --git a/resources/cl.h b/resources/CL/cl.h
index d353f9ad..d353f9ad 100644
--- a/resources/cl.h
+++ b/resources/CL/cl.h
diff --git a/resources/cl_gl.h b/resources/CL/cl_gl.h
index 4eab6d7a..4eab6d7a 100644
--- a/resources/cl_gl.h
+++ b/resources/CL/cl_gl.h
diff --git a/resources/OpenCL.cfg b/resources/OpenCL.cfg
index 6a39180f..9ac199c1 100644
--- a/resources/OpenCL.cfg
+++ b/resources/OpenCL.cfg
@@ -31,4 +31,5 @@ Opaque long cl_device_id
#append to generated c files
CustomCCode #include <cl.h>
+CustomCCode #include <gl3.h>
CustomCCode #include <inttypes.h>
diff --git a/resources/gltypes.h b/resources/gltypes.h
new file mode 100644
index 00000000..3272b72a
--- /dev/null
+++ b/resources/gltypes.h
@@ -0,0 +1,18 @@
+//we need only the basic gl types for the cl-gl interoperability
+//extracted from gl3.h
+
+typedef unsigned int GLenum;
+typedef unsigned char GLboolean;
+typedef unsigned int GLbitfield;
+typedef signed char GLbyte;
+typedef short GLshort;
+typedef int GLint;
+typedef int GLsizei;
+typedef unsigned char GLubyte;
+typedef unsigned short GLushort;
+typedef unsigned int GLuint;
+typedef float GLfloat;
+typedef float GLclampf;
+typedef double GLdouble;
+typedef double GLclampd;
+typedef void GLvoid;
diff --git a/resources/CL/opencl.h b/resources/opencl.h
index 4f621ab6..ab05e15a 100644
--- a/resources/CL/opencl.h
+++ b/resources/opencl.h
@@ -5,5 +5,6 @@
#ifdef _WIN32
#include <windows.h>
#endif
-#include <GL/gl.h>
+//#include <GL/gl.h>
+#include <gltypes.h>
#include <CL/cl_gl.h>