P4 to Git Change 2006447 by gandryey@gera-win10 on 2019/09/30 13:32:36

SWDEV-79445 - OCL generic changes and code clean-up
	- Allow to disable GPUOpen build

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/build/Makefile.pal#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbedefs#52 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#167 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palgpuopen.cpp#18 edit


[ROCm/clr commit: 4794298058]

projects/clr/rocclr/runtime/device/pal/paldevice.cpp

@@ -1105,6 +1105,7 @@ bool Device::create(Pal::IDevice* device) {
 // Master function that handles developer callbacks from PAL.
 void PAL_STDCALL Device::PalDeveloperCallback(void* pPrivateData, const Pal::uint32 deviceIndex,
                                               Pal::Developer::CallbackType type, void* pCbData) {
+#ifdef PAL_GPUOPEN_OCL
   VirtualGPU* gpu = nullptr;
   Device* device = static_cast<Device*>(pPrivateData);
   const auto& barrier = *static_cast<const Pal::Developer::BarrierData*>(pCbData);
@@ -1143,6 +1144,7 @@ void PAL_STDCALL Device::PalDeveloperCallback(void* pPrivateData, const Pal::uin
     default:
       break;
   }
+#endif // PAL_GPUOPEN_OCL
 }
 
 bool Device::initializeHeapResources() {

projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp

@@ -22,6 +22,7 @@
 #include "palFence.h"
 #include "palQueueSemaphore.h"
 
+#ifdef PAL_GPUOPEN_OCL
 // gpuutil headers
 #include "gpuUtil/palGpaSession.h"
 
@@ -819,5 +820,6 @@ void RgpCaptureMgr::WriteUserEventMarker(const VirtualGPU* gpu,
   WriteMarker(gpu, user_event_, markerSize);
 }
 
+}  // namespace pal
 
-};  // namespace pal
+#endif // PAL_GPUOPEN_OCL