refactored platform specific defines into icd_platform.h

Author: bashbaug

CMakeLists.txt

@@ -41,14 +41,20 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/loader/icd_cmake_config.h.in
 
 set (OPENCL_ICD_LOADER_SOURCES
     loader/icd.c
-    loader/icd_dispatch.c)
+    loader/icd.h
+    loader/icd_dispatch.c
+    loader/icd_dispatch.h
+    loader/icd_envvars.h
+    loader/icd_platform.h)
 
 if (WIN32)
     list (APPEND OPENCL_ICD_LOADER_SOURCES 
         loader/windows/icd_windows.c
+        loader/windows/icd_windows_dxgk.c
+        loader/windows/icd_windows_dxgk.h
         loader/windows/icd_windows_envvars.c
         loader/windows/icd_windows_hkr.c
-        loader/windows/icd_windows_dxgk.c
+        loader/windows/icd_windows_hkr.h
         loader/windows/OpenCL.def
         loader/windows/OpenCL.rc)
     # Only add the DXSDK include directory if the environment variable is

loader/icd.c

@@ -189,12 +189,6 @@ void khrIcdVendorAdd(const char *libraryName)
     }
 }
 
-#if defined(__linux__) || defined(__APPLE__)
-#define PATH_SEPARATOR ':'
-#elif defined(_WIN32)
-#define PATH_SEPARATOR ';'
-#endif
-
 // Get next file or dirname given a string list or registry key path.
 // Note: the input string may be modified!
 static char *loader_get_next_path(char *path) {

loader/icd.h

@@ -19,6 +19,8 @@
 #ifndef _ICD_H_
 #define _ICD_H_
 
+#include "icd_platform.h"
+
 #ifndef CL_USE_DEPRECATED_OPENCL_1_0_APIS
 #define CL_USE_DEPRECATED_OPENCL_1_0_APIS
 #endif
@@ -34,10 +36,6 @@
 #include <CL/cl.h>
 #include <CL/cl_ext.h>
 
-#ifdef _WIN32
-#include <tchar.h>
-#endif
-
 /*
  * type definitions
  */

loader/icd_platform.h

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2016-2019 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_PLATFORM_H_
+#define _ICD_PLATFORM_H_
+
+#if defined(__linux__) || defined(__APPLE__)
+
+#define PATH_SEPARATOR  ':'
+#define DIRECTORY_SYMBOL '/'
+#ifdef __ANDROID__
+#define ICD_VENDOR_PATH "/system/vendor/Khronos/OpenCL/vendors/";
+#else
+#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";
+#endif // ANDROID
+
+#elif defined(_WIN32)
+
+#define PATH_SEPARATOR ';'
+#define DIRECTORY_SYMBOL '\\'
+
+#endif
+
+#endif

loader/linux/icd_linux.c

@@ -40,12 +40,7 @@ void khrIcdOsVendorsEnumerate(void)
 {
     DIR *dir = NULL;
     struct dirent *dirEntry = NULL;
-    char* vendorPath =
-#ifdef __ANDROID__
-        "/system/vendor/Khronos/OpenCL/vendors/";
-#else
-        "/etc/OpenCL/vendors/";
-#endif // ANDROID
+    char* vendorPath = ICD_VENDOR_PATH;
     char* envPath = NULL;
 
     khrIcdVendorsEnumerateEnv();

loader/windows/icd_windows.c

@@ -69,7 +69,7 @@ BOOL CALLBACK khrIcdOsVendorsEnumerate(PINIT_ONCE InitOnce, PVOID Parameter, PVO
         {
             char cszLibraryName[1024] = {0};
             DWORD dwLibraryNameSize = sizeof(cszLibraryName);
-            DWORD dwLibraryNameType = 0;     
+            DWORD dwLibraryNameType = 0;
             DWORD dwValue = 0;
             DWORD dwValueSize = sizeof(dwValue);
 
@@ -85,15 +85,15 @@ BOOL CALLBACK khrIcdOsVendorsEnumerate(PINIT_ONCE InitOnce, PVOID Parameter, PVO
                   (LPBYTE)&dwValue,
                   &dwValueSize);
             // if RegEnumKeyEx fails, we are done with the enumeration
-            if (ERROR_SUCCESS != result) 
+            if (ERROR_SUCCESS != result)
             {
                 KHR_ICD_TRACE("Failed to read value %d, done reading key.\n", dwIndex);
                 break;
             }
             KHR_ICD_TRACE("Value %s found...\n", cszLibraryName);
 
             // Require that the value be a DWORD and equal zero
-            if (REG_DWORD != dwLibraryNameType)  
+            if (REG_DWORD != dwLibraryNameType)
             {
                 KHR_ICD_TRACE("Value not a DWORD, skipping\n");
                 continue;