Remove redundant OpenCL ICD library

src/libANGLE/renderer/cl/BUILD.gn

@@ -23,7 +23,7 @@ config("angle_cl_backend_config") {
 
 angle_source_set("angle_cl_backend") {
   sources = _cl_backend_sources
-  configs += [ "$angle_root/src/libOpenCL:opencl_icd_library_name" ]
+  configs += [ "$angle_root/src/libOpenCL:opencl_library_name" ]
 
   public_deps = [
     "$angle_root:libANGLE_headers",

src/libANGLE/renderer/cl/CLPlatformCL.cpp

@@ -48,16 +48,16 @@ CLPlatformCL::ImplList CLPlatformCL::GetPlatforms(bool isIcd)
     if (khrIcdVendors == nullptr)
     {
         // Our OpenCL entry points are not reentrant, so we have to prevent khrIcdInitialize()
-        // from querying ANGLE's OpenCL ICD library. We store a dummy entry with the library in
-        // the khrIcdVendors list, because the ICD Loader skips the libries which are already in
+        // from querying ANGLE's OpenCL library. We store a dummy entry with the library in the
+        // khrIcdVendors list, because the ICD Loader skips the libraries which are already in
         // the list as it assumes they were already enumerated.
         static angle::base::NoDestructor<KHRicdVendor> sVendorAngle({});
-        sVendorAngle->library = khrIcdOsLibraryLoad(ANGLE_OPENCL_ICD_LIB_NAME);
+        sVendorAngle->library = khrIcdOsLibraryLoad(ANGLE_OPENCL_LIB_NAME);
         khrIcdVendors         = sVendorAngle.get();
         if (khrIcdVendors->library != nullptr)
         {
             khrIcdInitialize();
-            // After the enumeration we don't need ANGLE's OpenCL ICD library any more,
+            // After the enumeration we don't need ANGLE's OpenCL library any more,
             // but we keep the dummy entry int the list to prevent another enumeration.
             khrIcdOsLibraryUnload(khrIcdVendors->library);
             khrIcdVendors->library = nullptr;

src/libOpenCL/BUILD.gn

@@ -8,43 +8,23 @@ import("../../gni/angle.gni")
 
 assert(angle_enable_cl)
 
-angle_shared_library("OpenCL_ANGLE") {
-  defines = [ "LIBCL_IMPLEMENTATION" ]
+cl_library_name = "OpenCL_ANGLE"
 
-  sources = [
-    "dispatch.cpp",
-    "dispatch.h",
-    "libOpenCL_autogen.cpp",
-  ]
-
-  configs += [
-    "$angle_root:debug_annotations_config",
-    "$angle_root:library_name_config",
-  ]
-
-  deps = [
-    "$angle_root:angle_common",
-    "$angle_root:cl_includes",
-  ]
-}
-
-icd_library_name = "OpenCL_ICD_ANGLE"
-
-config("opencl_icd_library_name") {
+config("opencl_library_name") {
   if (is_win) {
-    defines = [ "ANGLE_OPENCL_ICD_LIB_NAME=\"" + icd_library_name + "\"" ]
+    defines = [ "ANGLE_OPENCL_LIB_NAME=\"" + cl_library_name + "\"" ]
   } else {
-    defines = [ "ANGLE_OPENCL_ICD_LIB_NAME=\"lib" + icd_library_name + ".so\"" ]
+    defines = [ "ANGLE_OPENCL_LIB_NAME=\"lib" + cl_library_name + ".so\"" ]
   }
 }
 
-angle_shared_library(icd_library_name) {
+angle_shared_library(cl_library_name) {
   defines = [ "LIBCL_IMPLEMENTATION" ]
 
   sources = [
     "dispatch.cpp",
     "dispatch.h",
-    "libOpenCL_ICD.cpp",
+    "libOpenCL_autogen.cpp",
   ]
 
   configs += [
@@ -59,8 +39,5 @@ angle_shared_library(icd_library_name) {
 }
 
 group("angle_cl") {
-  data_deps = [
-    ":OpenCL_ANGLE",
-    ":OpenCL_ICD_ANGLE",
-  ]
+  data_deps = [ ":$cl_library_name" ]
 }

src/libOpenCL/libOpenCL_ICD.cpp

-//
-// Copyright 2021 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// libOpenCL_ICD.cpp: Implements the CL entry point required for extension cl_khr_icd.
-
-#include "libOpenCL/dispatch.h"
-
-extern "C" {
-
-void *CL_API_CALL clGetExtensionFunctionAddress(const char *func_name)
-{
-    return cl::GetDispatch().clGetExtensionFunctionAddress(func_name);
-}
-
-}  // extern "C"