Removed cl_icd_layer.h as it is now in the OpenCL-Headers repository under CL/cl_laye...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 620aff6338a611f7d79df492015b52b036084ac8..cc6ede763e2013900f4e4be13833db946b30750e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,11 +56,6 @@ set (OPENCL_ICD_LOADER_SOURCES
     loader/icd_envvars.h
     loader/icd_platform.h)
 
-if (ENABLE_OPENCL_LAYERS)
-    list (APPEND OPENCL_ICD_LOADER_SOURCES
-        include/cl_icd_layer.h)
-endif ()
-
 if (WIN32)
     list (APPEND OPENCL_ICD_LOADER_SOURCES 
         loader/windows/adapter.h

diff --git a/include/cl_icd_layer.h b/include/cl_icd_layer.h
deleted file mode 100644 (file)
index 629f8f4..0000000
--- a/include/cl_icd_layer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2020 The Khronos Group Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.
- */
-
-#ifndef __ICD_LAYER_H
-#define __ICD_LAYER_H
-
-#include <CL/cl.h>
-#include <CL/cl_icd.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef cl_uint cl_layer_info;
-typedef cl_uint cl_layer_api_version;
-#define CL_LAYER_API_VERSION 0x4240
-#define CL_LAYER_API_VERSION_100 100
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetLayerInfo(cl_layer_info  param_name,
-               size_t         param_value_size,
-               void          *param_value,
-               size_t        *param_value_size_ret);
-
-CL_API_ENTRY typedef cl_int
-(CL_API_CALL *pfn_clGetLayerInfo)(cl_layer_info  param_name,
-                                  size_t         param_value_size,
-                                  void          *param_value,
-                                  size_t        *param_value_size_ret);
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clInitLayer(cl_uint                         num_entries,
-            const struct _cl_icd_dispatch  *target_dispatch,
-            cl_uint                        *num_entries_ret,
-            const struct _cl_icd_dispatch **layer_dispatch_ret);
-
-CL_API_ENTRY typedef cl_int
-(CL_API_CALL *pfn_clInitLayer)(cl_uint                         num_entries,
-                               const struct _cl_icd_dispatch  *target_dispatch,
-                               cl_uint                        *num_entries_ret,
-                               const struct _cl_icd_dispatch **layer_dispatch_ret);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __ICD_LAYER_H */

diff --git a/loader/icd.c b/loader/icd.c
index b43ecd70b3cd8c88fd7f8b665224942a6c7ca1ca..7e7b3b5ed7e8eb55c487835165d310c67d243d89 100644 (file)
--- a/loader/icd.c
+++ b/loader/icd.c
@@ -20,7 +20,7 @@
 #include "icd_dispatch.h"
 #include "icd_envvars.h"
 #if defined(CL_ENABLE_LAYERS)
-#include "cl_icd_layer.h"
+#include <CL/cl_layer.h>
 #endif // defined(CL_ENABLE_LAYERS)
 #include <stdlib.h>
 #include <string.h>

diff --git a/test/layer/CMakeLists.txt b/test/layer/CMakeLists.txt
index 117a3bddb81999befd04182a2e66a616b25bac82..b985ef3430f54b54f7f91e723159d87a1d6c3325 100644 (file)
--- a/test/layer/CMakeLists.txt
+++ b/test/layer/CMakeLists.txt
@@ -2,8 +2,7 @@ get_filename_component(PARENT_DIR ../../ ABSOLUTE)
 set (OPENCL_PRINT_LAYER_SOURCES
     icd_print_layer.c
     icd_print_layer.h
-    icd_print_layer_generated.c
-    ${PARENT_DIR}/include/cl_icd_layer.h)
+    icd_print_layer_generated.c)
 
 if (WIN32)
     list (APPEND OPENCL_PRINT_LAYER_SOURCES icd_print_layer.def)

diff --git a/test/layer/icd_print_layer.h b/test/layer/icd_print_layer.h
index 02390e534b66738da03b370fcb890bcaf94e58d9..6c73fe6e39f57abcf8d6cd897973e47e18b2b449 100644 (file)
--- a/test/layer/icd_print_layer.h
+++ b/test/layer/icd_print_layer.h
@@ -44,7 +44,7 @@
 #endif
 
 #include <stdio.h>
-#include "cl_icd_layer.h"
+#include <CL/cl_layer.h>
 
 #ifdef __cplusplus
 extern "C" {