From 90d3d3bbce5afaa584f25136e39abd4d05b41e9a Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Fri, 10 Mar 2023 15:22:19 -0600 Subject: [PATCH 1/5] Remove cl_icdl_private.h as it is now unneeded. --- CMakeLists.txt | 1 - loader/cl_icdl_private.h | 46 ---------------------------------------- loader/icd_dispatch.c | 1 - 3 files changed, 48 deletions(-) delete mode 100644 loader/cl_icdl_private.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 567ceee1..7cb30797 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,6 @@ set (OPENCL_ICD_LOADER_SOURCES loader/icd.c loader/icd.h loader/icd_version.h - loader/cl_icdl_private.h loader/icd_dispatch.c loader/icd_dispatch.h loader/icd_dispatch_generated.c diff --git a/loader/cl_icdl_private.h b/loader/cl_icdl_private.h deleted file mode 100644 index c6dde0d9..00000000 --- a/loader/cl_icdl_private.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2016-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 OPENCL_CL_ICDL_H -#define OPENCL_CL_ICDL_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef cl_uint cl_icdl_info; - -#define CL_ICDL_OCL_VERSION 1 -#define CL_ICDL_VERSION 2 -#define CL_ICDL_NAME 3 -#define CL_ICDL_VENDOR 4 - -typedef cl_int -(CL_API_CALL * pfn_clGetICDLoaderInfoOCLICD)(cl_icdl_info param_name, - size_t param_value_size, - void * param_value, - size_t * param_value_size_ret); - -#ifdef __cplusplus -} -#endif - - -#endif /* OPENCL_CL_ICDL_H */ diff --git a/loader/icd_dispatch.c b/loader/icd_dispatch.c index 70a71cb7..090a5ac4 100644 --- a/loader/icd_dispatch.c +++ b/loader/icd_dispatch.c @@ -18,7 +18,6 @@ #include "icd.h" #include "icd_dispatch.h" -#include "cl_icdl_private.h" #include "icd_version.h" #include From 304498616cb8a844dd1bde3e192de14b477d60fc Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Mon, 20 Mar 2023 17:34:26 -0500 Subject: [PATCH 2/5] Temporary commit to test new header scheme TODO: revert when Headers are merged. --- .github/workflows/linux.yml | 6 ++++-- .github/workflows/macos.yml | 3 ++- .github/workflows/windows.yml | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d48ba7fd..79f3c9c5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,8 +32,9 @@ jobs: - name: Checkout OpenCL-Headers uses: actions/checkout@v3 with: - repository: KhronosGroup/OpenCL-Headers + repository: Kerilk/OpenCL-Headers path: external/OpenCL-Headers + ref: cl_icdl - name: Build & install OpenCL-Headers run: $CMAKE_EXE @@ -177,8 +178,9 @@ jobs: - name: Checkout OpenCL-Headers uses: actions/checkout@v3 with: - repository: KhronosGroup/OpenCL-Headers + repository: Kerilk/OpenCL-Headers path: external/OpenCL-Headers + ref: cl_icdl - name: Create Build Environment run: sudo apt-get update -q; diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 53fc5e7d..3070b626 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,8 +23,9 @@ jobs: - name: Checkout OpenCL-Headers uses: actions/checkout@v3 with: - repository: KhronosGroup/OpenCL-Headers + repository: Kerilk/OpenCL-Headers path: external/OpenCL-Headers + ref: cl_icdl - name: Install gcc if required run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4c016be5..9d852531 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,8 +27,9 @@ jobs: - name: Checkout OpenCL-Headers uses: actions/checkout@v3 with: - repository: KhronosGroup/OpenCL-Headers + repository: Kerilk/OpenCL-Headers path: external/OpenCL-Headers + ref: cl_icdl - name: Create Build Environment shell: pwsh From e9fadf7e46c9fddcad043d070a77622a5d1bcf4e Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Mon, 20 Mar 2023 17:45:39 -0500 Subject: [PATCH 3/5] Use CL_NO_PROTOTYPES to avoid declaring clGetICDLoaderInfoOCLICD prototype extern. --- loader/icd_dispatch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/icd_dispatch.c b/loader/icd_dispatch.c index 090a5ac4..4843db68 100644 --- a/loader/icd_dispatch.c +++ b/loader/icd_dispatch.c @@ -16,6 +16,7 @@ * OpenCL is a trademark of Apple Inc. used under license by Khronos. */ +#define CL_NO_PROTOTYPES #include "icd.h" #include "icd_dispatch.h" #include "icd_version.h" From 6bf66a7f2de6599dd60b9c1ebecbe1b50331ed93 Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Tue, 11 Apr 2023 11:45:36 -0500 Subject: [PATCH 4/5] Revert "Temporary commit to test new header scheme TODO: revert when Headers are merged." This reverts commit 137f0a50436e4a5da980c71852b9440fafd3e00a. --- .github/workflows/linux.yml | 6 ++---- .github/workflows/macos.yml | 3 +-- .github/workflows/windows.yml | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 79f3c9c5..d48ba7fd 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,9 +32,8 @@ jobs: - name: Checkout OpenCL-Headers uses: actions/checkout@v3 with: - repository: Kerilk/OpenCL-Headers + repository: KhronosGroup/OpenCL-Headers path: external/OpenCL-Headers - ref: cl_icdl - name: Build & install OpenCL-Headers run: $CMAKE_EXE @@ -178,9 +177,8 @@ jobs: - name: Checkout OpenCL-Headers uses: actions/checkout@v3 with: - repository: Kerilk/OpenCL-Headers + repository: KhronosGroup/OpenCL-Headers path: external/OpenCL-Headers - ref: cl_icdl - name: Create Build Environment run: sudo apt-get update -q; diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3070b626..53fc5e7d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,9 +23,8 @@ jobs: - name: Checkout OpenCL-Headers uses: actions/checkout@v3 with: - repository: Kerilk/OpenCL-Headers + repository: KhronosGroup/OpenCL-Headers path: external/OpenCL-Headers - ref: cl_icdl - name: Install gcc if required run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9d852531..4c016be5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,9 +27,8 @@ jobs: - name: Checkout OpenCL-Headers uses: actions/checkout@v3 with: - repository: Kerilk/OpenCL-Headers + repository: KhronosGroup/OpenCL-Headers path: external/OpenCL-Headers - ref: cl_icdl - name: Create Build Environment shell: pwsh From 6feaadcc529fbfeb90d291e3eab1b58b9bb4dee9 Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Tue, 11 Apr 2023 11:59:30 -0500 Subject: [PATCH 5/5] Remove CL_NO_PROTOTYPES. --- loader/icd_dispatch.c | 1 - 1 file changed, 1 deletion(-) diff --git a/loader/icd_dispatch.c b/loader/icd_dispatch.c index 4843db68..090a5ac4 100644 --- a/loader/icd_dispatch.c +++ b/loader/icd_dispatch.c @@ -16,7 +16,6 @@ * OpenCL is a trademark of Apple Inc. used under license by Khronos. */ -#define CL_NO_PROTOTYPES #include "icd.h" #include "icd_dispatch.h" #include "icd_version.h"