Commit f780e15c authored by Alexey Sotkin's avatar Alexey Sotkin
Browse files

[OpenCL] Fix support for cl_khr_mipmap_image_writes 

Text of the extension is available here:
https://github.com/KhronosGroup/OpenCL-Docs/blob/master/ext/cl_khr_mipmap_image.asciidoc

Patch by Ilya Mashkov

Differential Revision: https://reviews.llvm.org/D71460
parent 8616bd41

clang/include/clang/Basic/OpenCLExtensions.def

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ OPENCLEXT_INTERNAL(cl_khr_spir, 120, ~0U) 
OPENCLEXT_INTERNAL(cl_khr_egl_event, 200, ~0U)

OPENCLEXT_INTERNAL(cl_khr_egl_image, 200, ~0U)

OPENCLEXT_INTERNAL(cl_khr_mipmap_image, 200, ~0U)

OPENCLEXT_INTERNAL(cl_khr_mipmap_image_writes, 200, ~0U)

OPENCLEXT_INTERNAL(cl_khr_srgb_image_writes, 200, ~0U)

OPENCLEXT_INTERNAL(cl_khr_subgroups, 200, ~0U)

OPENCLEXT_INTERNAL(cl_khr_terminate_context, 200, ~0U)

clang/lib/Headers/opencl-c.h

+10 −8
Original line number Diff line number Diff line
@@ -14682,7 +14682,7 @@ void __ovld write_imagef(write_only image2d_array_depth_t image, int4 coord, flo 














// OpenCL Extension v2.0 s9.18 - Mipmaps















#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)













#ifdef cl_khr_mipmap_image













#if defined(cl_khr_mipmap_image_writes)















void __ovld write_imagef(write_only image1d_t image, int coord, int lod, float4 color);















void __ovld write_imagei(write_only image1d_t image, int coord, int lod, int4 color);















void __ovld write_imageui(write_only image1d_t image, int coord, int lod, uint4 color);









@@ -14699,15 +14699,16 @@ void __ovld write_imagef(write_only image2d_array_t image_array, int4 coord, int













void __ovld write_imagei(write_only image2d_array_t image_array, int4 coord, int lod, int4 color);















void __ovld write_imageui(write_only image2d_array_t image_array, int4 coord, int lod, uint4 color);



























void __ovld write_imagef(write_only image2d_depth_t image, int2 coord, int lod, float color);













void __ovld write_imagef(write_only image2d_array_depth_t image, int4 coord, int lod, float color);













void __ovld write_imagef(write_only image2d_depth_t image, int2 coord, int lod, float depth);













void __ovld write_imagef(write_only image2d_array_depth_t image, int4 coord, int lod, float depth);





























#ifdef cl_khr_3d_image_writes















void __ovld write_imagef(write_only image3d_t image, int4 coord, int lod, float4 color);















void __ovld write_imagei(write_only image3d_t image, int4 coord, int lod, int4 color);















void __ovld write_imageui(write_only image3d_t image, int4 coord, int lod, uint4 color);













#endif













#endif //cl_khr_mipmap_image













#endif //cl_khr_3d_image_writes

























#endif //defined(cl_khr_mipmap_image_writes)















#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)





























// Image write functions for half4 type










@@ -14756,7 +14757,7 @@ void __ovld write_imagef(read_write image2d_array_depth_t image, int4 coord, flo













#endif //cl_khr_depth_images





























#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)













#ifdef cl_khr_mipmap_image













#if defined(cl_khr_mipmap_image_writes)















void __ovld write_imagef(read_write image1d_t image, int coord, int lod, float4 color);















void __ovld write_imagei(read_write image1d_t image, int coord, int lod, int4 color);















void __ovld write_imageui(read_write image1d_t image, int coord, int lod, uint4 color);









@@ -14780,8 +14781,9 @@ void __ovld write_imagef(read_write image2d_array_depth_t image, int4 coord, int













void __ovld write_imagef(read_write image3d_t image, int4 coord, int lod, float4 color);















void __ovld write_imagei(read_write image3d_t image, int4 coord, int lod, int4 color);















void __ovld write_imageui(read_write image3d_t image, int4 coord, int lod, uint4 color);













#endif













#endif //cl_khr_mipmap_image













#endif //cl_khr_3d_image_writes

























#endif //cl_khr_mipmap_image_writes















#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)





























// Image write functions for half4 type

























clang/test/SemaOpenCL/extension-version.cl



+12
−0






























Original line number
Diff line number
Diff line








@@ -242,6 +242,18 @@













#endif















#pragma OPENCL EXTENSION cl_khr_mipmap_image : enable





























#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)













#ifndef cl_khr_mipmap_image_writes













#error "Missing cl_khr_mipmap_image_writes define"













#endif













#else













#ifdef cl_khr_mipmap_image_writes













#error "Incorrect cl_khr_mipmap_image_writes define"













#endif













// expected-warning@+2{{unsupported OpenCL extension 'cl_khr_mipmap_image_writes' - ignoring}}













#endif













#pragma OPENCL EXTENSION cl_khr_mipmap_image_writes : enable





























#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)















#ifndef cl_khr_srgb_image_writes















#error "Missing cl_khr_srgb_image_writes define"