From d04938a6ada79dc7c489d02743d4e9d4017fc025 Mon Sep 17 00:00:00 2001
From: Jeremy Newton <Jeremy.Newton@amd.com>
Date: Mon, 9 May 2022 13:53:49 -0400
Subject: [PATCH] SWDEV-336248 - Use public icd header

HIP uses icd_dispatch.h, which is not a public header. Using the public
CL/cl_icd.h removes inclusion of the private header.

This allows compiling HIP without relying on OCL ICD source, which makes
distributing a standalone ROCclr easier.

For WIN32, a few other headers are required.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I0cab173b9753c5b0ab3be9222aa8bb0545cdeaab
---
 hipamd/src/fixme.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/hipamd/src/fixme.cpp b/hipamd/src/fixme.cpp
index 3b6b55bcde..3560eff8c1 100644
--- a/hipamd/src/fixme.cpp
+++ b/hipamd/src/fixme.cpp
@@ -19,7 +19,15 @@
  THE SOFTWARE. */
 
 #include "vdi_common.hpp"
-#include <icd/loader/icd_dispatch.h>
+#ifdef _WIN32
+#include <windows.h>
+#include <d3d9.h>
+#include <d3d10_1.h>
+#include <CL/cl_d3d10.h>
+#include <CL/cl_d3d11.h>
+#include <CL/cl_dx9_media_sharing.h>
+#endif
+#include <CL/cl_icd.h>
 
 cl_icd_dispatch amd::ICDDispatchedObject::icdVendorDispatch_[] = {0};
 amd::PlatformIDS amd::PlatformID::Platform = {amd::ICDDispatchedObject::icdVendorDispatch_};