Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/mgajda/opencl into develop

  • Loading branch information...
commit 06606bdf7f3a549036fc2d6e37d7ee1d5263ee31 2 parents 5a64212 + 6843b74
@zhensydow zhensydow authored
Showing with 7 additions and 0 deletions.
  1. +2 −0  OpenCL.cabal
  2. +5 −0 src/Control/Parallel/OpenCL/Types.chs
View
2  OpenCL.cabal
@@ -49,6 +49,8 @@ Library
if os(linux)
cpp-options: -DCALLCONV=ccall -Iinclude
Frameworks: OpenCL
+ -- this is needed for linking executables, but not for ghci -lOpenCL:
+ extra-libraries: OpenCL
if os(darwin)
cpp-options: -DCALLCONV=ccall
View
5 src/Control/Parallel/OpenCL/Types.chs
@@ -65,6 +65,7 @@ import Control.Exception( Exception(..), throwIO )
#include <OpenCL/opencl.h>
#else
#include <CL/cl.h>
+#include <CL/cl_ext.h>
#endif
-- -----------------------------------------------------------------------------
@@ -115,6 +116,7 @@ type CLAddressingMode_ = {#type cl_addressing_mode#}
-- -----------------------------------------------------------------------------
#c
enum CLError {
+ cL_PLATFORM_NOT_FOUND_KHR=CL_PLATFORM_NOT_FOUND_KHR,
cL_BUILD_PROGRAM_FAILURE=CL_BUILD_PROGRAM_FAILURE,
cL_COMPILER_NOT_AVAILABLE=CL_COMPILER_NOT_AVAILABLE,
cL_DEVICE_NOT_AVAILABLE=CL_DEVICE_NOT_AVAILABLE,
@@ -177,6 +179,9 @@ available.
* 'CL_DEVICE_NOT_FOUND', Returned if no OpenCL devices that match the specified
devices were found.
+ * 'CL_PLATFORM_NOT_FOUND_khr', Returned when no .icd (platform drivers)
+ can be properly loaded.
+
* 'CL_IMAGE_FORMAT_MISMATCH', Returned if the specified source and destination
images are not valid image objects.
Please sign in to comment.
Something went wrong with that request. Please try again.