Refactor ICD loader windows header files

Add icd_windows.h to include Windows specific
types and functions.
Keep icd_windows_hkr.h and icd_windows_dxgk.h
limited to the HKR and DXGK specific information.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21da30d17a2df881714762685c0c0d43d79f7ec3..4bafa862e2dd336f80fa3c31948dbef0169d8589 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ set (OPENCL_ICD_LOADER_SOURCES
 if (WIN32)
     list (APPEND OPENCL_ICD_LOADER_SOURCES 
         loader/windows/icd_windows.c
+        loader/windows/icd_windows.h
         loader/windows/icd_windows_dxgk.c
         loader/windows/icd_windows_dxgk.h
         loader/windows/icd_windows_envvars.c

diff --git a/loader/windows/icd_windows.c b/loader/windows/icd_windows.c
index 12c251a78fad8f94f3a9cd834ec42ac8c9a25cc6..c80615d44788a40a3197faaed3786fad1299fc97 100644 (file)
--- a/loader/windows/icd_windows.c
+++ b/loader/windows/icd_windows.c
@@ -17,6 +17,7 @@
  */
 
 #include "icd.h"
+#include "icd_windows.h"
 #include "icd_windows_hkr.h"
 #include "icd_windows_dxgk.h"
 #include <stdio.h>

diff --git a/loader/windows/icd_windows.h b/loader/windows/icd_windows.h
new file mode 100644 (file)
index 0000000..48bbf13
--- /dev/null
+++ b/loader/windows/icd_windows.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2017-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.
+ */
+
+#include <stdbool.h>
+#include <windows.h>
+
+extern const LUID ZeroLuid;
+
+BOOL adapterAdd(const char* szName, LUID luid);
+
+// Do not free the memory returned by this function.
+const char* getOpenCLRegKeyName(void);

diff --git a/loader/windows/icd_windows_dxgk.h b/loader/windows/icd_windows_dxgk.h
index f6cb65d4c984f8fcaf5bf625f493d639c594b6e0..34bad64af4071ef07b1563cf7d86a43ad43acfbc 100644 (file)
--- a/loader/windows/icd_windows_dxgk.h
+++ b/loader/windows/icd_windows_dxgk.h
@@ -17,5 +17,6 @@
  */
 
 #include <stdbool.h>
+#include "icd_windows.h"
 
 bool khrIcdOsVendorsEnumerateDXGK(void);

diff --git a/loader/windows/icd_windows_hkr.h b/loader/windows/icd_windows_hkr.h
index 039da05365672a74436594369ac3eda5f215f6df..e0db713bb76c16cbe565e426cecb6f336492b6c4 100644 (file)
--- a/loader/windows/icd_windows_hkr.h
+++ b/loader/windows/icd_windows_hkr.h
@@ -17,13 +17,6 @@
  */
 
 #include <stdbool.h>
-#include <windows.h>
+#include "icd_windows.h"
 
 bool khrIcdOsVendorsEnumerateHKR(void);
-
-extern const LUID ZeroLuid;
-
-BOOL adapterAdd(const char* szName, LUID luid);
-
-// Do not free the memory returned by this function.
-const char* getOpenCLRegKeyName(void);