P4 to Git Change 1404293 by lmoriche@lmoriche_opencl_dev2 on 2017/05/01 16:43:07

SWDEV-102726 - [OCL-LC-ROCm] Open source OpenCL Runtime
	- Changes required to use the Khronos ICD sources instead of ours.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#3 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd.cpp#29 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpubinary.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpubinary.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#319 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#127 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#233 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#239 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/object.hpp#18 edit


[ROCm/clr commit: 0af2c7043c]

projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp

@@ -1,6 +1,13 @@
 // Copyright (c) 2008 Advanced Micro Devices, Inc. All rights reserved.
 //
 
+#if defined(ATI_OS_WIN)
+#define WIN32_LEAN_AND_MEAN 1
+#include <Windows.h>
+#endif
+#include <GL/gl.h>
+#include "GL/glATIInternal.h"
+
 #include "platform/program.hpp"
 #include "platform/kernel.hpp"
 #include "os/os.hpp"
@@ -13,8 +20,6 @@
 #include "device/gpu/gputimestamp.hpp"
 #include "thread/atomic.hpp"
 #include "hsa_ext_image.h"
-#include <GL/gl.h>
-#include "GL/glATIInternal.h"
 
 #include <string>
 #include <fstream>