OpenCL 1.1 does not define CL_VERSION_1_2 so use hardcoded number instead

Otherwise the test evaluates to true on OpenCL 1.1 and earlier. Since we
therefore cannot use the CL_VERSION_?_? macros move them to the proper
position in the top-level header.

llvm-svn: 211787
This commit is contained in:
Jeroen Ketema 2014-06-26 15:26:38 +00:00
parent 606769ecc6
commit 575fb84cc3
2 changed files with 4 additions and 4 deletions

View File

@ -11,9 +11,6 @@
/* Function Attributes */
#include <clc/clcfunc.h>
/* 6.9 Preprocessor Directives and Macros */
#include <clc/clcversion.h>
/* 6.1 Supported Data Types */
#include <clc/clctypes.h>
@ -23,6 +20,9 @@
/* 6.2.4.2 Reinterpreting Types Using as_type() and as_typen() */
#include <clc/as_type.h>
/* 6.9 Preprocessor Directives and Macros */
#include <clc/clcversion.h>
/* 6.11.1 Work-Item Functions */
#include <clc/workitem/get_global_size.h>
#include <clc/workitem/get_global_id.h>

View File

@ -49,7 +49,7 @@
#ifdef cl_khr_fp16
#if __OPENCL_VERSION__ >= CL_VERSION_1_2
#if __OPENCL_VERSION__ >= 120
#define HALF_DIG 3
#define HALF_MANT_DIG 11