From 75b8a9d66858266a8acf56bf184efb84e9c4741f Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Mon, 29 Jul 2019 15:56:57 -0400
Subject: [PATCH] P4 to Git Change 1975233 by jatang@jatang_win_pal_lc on
 2019/07/29 15:52:54

	SWDEV-1 - Integrate new khronos tree structure.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_execute.cpp#30 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd.cpp#35 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/OpenCL.def.in#14 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/OpenCL.rc#20 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/build/Makefile.icd#37 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd.c#13 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd.h#12 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_dispatch.c#31 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_dispatch.h#26 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_exports.map.in#10 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_linux.c#12 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_windows.c#12 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c#6 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_windows_dxgk.h#2 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_windows_hkr.c#4 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_windows_hkr.h#2 move/delete
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/icd.c#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/icd.h#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/icd_dispatch.c#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/icd_dispatch.h#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/linux/icd_exports.map.in#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/linux/icd_linux.c#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/windows/OpenCL.def.in#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/windows/OpenCL.rc#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/windows/icd_windows.c#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.c#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.h#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.c#1 move/add
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.h#1 move/add
... //depot/stg/opencl/drivers/opencl/runtime/platform/object.hpp#19 edit


[ROCm/clr commit: 6f8acf963686364c1ef1572ccd478d11e1bf6fb7]
---
 projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp            | 2 +-
 projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp                | 2 +-
 projects/clr/opencl/api/opencl/khronos/icd/{ => loader}/icd.c   | 0
 projects/clr/opencl/api/opencl/khronos/icd/{ => loader}/icd.h   | 0
 .../opencl/api/opencl/khronos/icd/{ => loader}/icd_dispatch.c   | 0
 .../opencl/api/opencl/khronos/icd/{ => loader}/icd_dispatch.h   | 0
 .../api/opencl/khronos/icd/{ => loader/linux}/icd_linux.c       | 0
 .../api/opencl/khronos/icd/{ => loader/windows}/OpenCL.rc       | 0
 .../api/opencl/khronos/icd/{ => loader/windows}/icd_windows.c   | 0
 .../opencl/khronos/icd/{ => loader/windows}/icd_windows_dxgk.c  | 0
 .../opencl/khronos/icd/{ => loader/windows}/icd_windows_dxgk.h  | 0
 .../opencl/khronos/icd/{ => loader/windows}/icd_windows_hkr.c   | 0
 .../opencl/khronos/icd/{ => loader/windows}/icd_windows_hkr.h   | 0
 13 files changed, 2 insertions(+), 2 deletions(-)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader}/icd.c (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader}/icd.h (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader}/icd_dispatch.c (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader}/icd_dispatch.h (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader/linux}/icd_linux.c (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader/windows}/OpenCL.rc (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader/windows}/icd_windows.c (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader/windows}/icd_windows_dxgk.c (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader/windows}/icd_windows_dxgk.h (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader/windows}/icd_windows_hkr.c (100%)
 rename projects/clr/opencl/api/opencl/khronos/icd/{ => loader/windows}/icd_windows_hkr.h (100%)

diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp
index 0336353929..ee799e66e4 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp
@@ -10,7 +10,7 @@
 #include "platform/program.hpp"
 #include "os/os.hpp"
 
-#include <icd/icd_dispatch.h>
+#include <icd/loader/icd_dispatch.h>
 
 /*! \addtogroup API
  *  @{
diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp
index 71b886c40b..7e4e317a45 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp
@@ -10,7 +10,7 @@
 #include "cl_d3d11_amd.hpp"
 #endif  //_WIN32
 
-#include <icd/icd_dispatch.h>
+#include <icd/loader/icd_dispatch.h>
 
 #include <mutex>
 
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/icd.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/icd.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd.h b/projects/clr/opencl/api/opencl/khronos/icd/loader/icd.h
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd.h
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/icd.h
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_dispatch.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/icd_dispatch.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_dispatch.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/icd_dispatch.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_dispatch.h b/projects/clr/opencl/api/opencl/khronos/icd/loader/icd_dispatch.h
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_dispatch.h
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/icd_dispatch.h
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_linux.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/linux/icd_linux.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_linux.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/linux/icd_linux.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/OpenCL.rc b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/OpenCL.rc
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/OpenCL.rc
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/OpenCL.rc
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows_dxgk.h b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.h
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows_dxgk.h
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.h
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows_hkr.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows_hkr.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows_hkr.h b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.h
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows_hkr.h
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.h