From 3699162befa102e17d14e5b562460efd08a20ecc Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Tue, 31 Mar 2015 15:00:52 -0400
Subject: [PATCH] P4 to Git Change 1136311 by rili@rili_opencl_stg on
 2015/03/31 14:29:39

	EPR #416125 - Remove extension cl_amd_open_video from build.
	                         All codes related to this extension will be removed later

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/Makefile#6 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_open_video_amd.h#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#242 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#505 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.cpp#90 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.hpp#47 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.cpp#29 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.cpp#19 edit
---
 rocclr/runtime/device/device.hpp         | 2 ++
 rocclr/runtime/device/gpu/gpudevice.cpp  | 4 ++--
 rocclr/runtime/device/hsa/hsadevice.cpp  | 2 +-
 rocclr/runtime/platform/commandqueue.cpp | 6 +++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/rocclr/runtime/device/device.hpp b/rocclr/runtime/device/device.hpp
index 77697ba379..76073855cb 100644
--- a/rocclr/runtime/device/device.hpp
+++ b/rocclr/runtime/device/device.hpp
@@ -146,7 +146,9 @@ OclExtensionsString[] = {
 #endif
     "cl_khr_image2d_from_buffer ",
     "cl_amd_image2d_from_buffer_read_only ",
+#if cl_amd_open_video
     "cl_amd_open_video ",
+#endif // cl_amd_open_video
     "",
     "cl_amd_bus_addressable_memory ",
     "cl_amd_c11_atomics ",
diff --git a/rocclr/runtime/device/gpu/gpudevice.cpp b/rocclr/runtime/device/gpu/gpudevice.cpp
index a5cd3f290b..385ebdc229 100644
--- a/rocclr/runtime/device/gpu/gpudevice.cpp
+++ b/rocclr/runtime/device/gpu/gpudevice.cpp
@@ -1075,9 +1075,9 @@ Device::initializeHeapResources()
         // Create a synchronized transfer queue
         xferQueue_ = new VirtualGPU(*this);
         if (!(xferQueue_ && xferQueue_->create(
-            false,
+            false
     #if cl_amd_open_video
-            NULL
+            ,NULL
     #endif // cl_amd_open_video
             ))) {
             delete xferQueue_;
diff --git a/rocclr/runtime/device/hsa/hsadevice.cpp b/rocclr/runtime/device/hsa/hsadevice.cpp
index 2b8a92fb08..5c58bec63e 100644
--- a/rocclr/runtime/device/hsa/hsadevice.cpp
+++ b/rocclr/runtime/device/hsa/hsadevice.cpp
@@ -884,7 +884,7 @@ Device::xferQueue() const
         // Create virtual device for internal memory transfer
         Device* thisDevice = const_cast<Device*>(this);
         thisDevice->xferQueue_ = reinterpret_cast<VirtualGPU*>(
-                thisDevice->createVirtualDevice(false, false, NULL));
+                thisDevice->createVirtualDevice(false, false));
         if (!xferQueue_) {
             LogError("Couldn't create the device transfer manager!");
         }
diff --git a/rocclr/runtime/platform/commandqueue.cpp b/rocclr/runtime/platform/commandqueue.cpp
index afb62274db..d6724aab9f 100644
--- a/rocclr/runtime/platform/commandqueue.cpp
+++ b/rocclr/runtime/platform/commandqueue.cpp
@@ -184,7 +184,11 @@ DeviceQueue::create()
 
     virtualDevice_ = device().createVirtualDevice(
         properties().test(CL_QUEUE_PROFILING_ENABLE),
-        !InteropQueue, NULL, size_);
+        !InteropQueue
+#if cl_amd_open_video
+        , NULL
+#endif // cl_amd_open_video
+        , size_);
 
     if (virtualDevice_ != NULL) {
         result = true;