From 1d774ec2b27129b5b481b68ccbad4842325be8f6 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Tue, 8 May 2018 15:07:44 -0400
Subject: [PATCH] P4 to Git Change 1551967 by gandryey@gera-w8 on 2018/05/08
 14:11:14

	SWDEV-151981 - Removal of CPU support on Windows
	- Part 4. Remove CPU specific logic for CL-GL interop

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d10.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d10_amd.hpp#10 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d11.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d11_amd.hpp#14 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d9.cpp#35 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d9_amd.hpp#18 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl.cpp#58 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl_amd.hpp#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/interop.hpp#13 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.hpp#103 edit
---
 rocclr/runtime/platform/interop.hpp |  4 ----
 rocclr/runtime/platform/memory.hpp  | 13 -------------
 2 files changed, 17 deletions(-)

diff --git a/rocclr/runtime/platform/interop.hpp b/rocclr/runtime/platform/interop.hpp
index 29f6be6c58..55c8116249 100644
--- a/rocclr/runtime/platform/interop.hpp
+++ b/rocclr/runtime/platform/interop.hpp
@@ -37,10 +37,6 @@ class InteropObject {
   virtual bool copyOrigToShared() { return true; }
   // On release copy data from shared copy to the original resource
   virtual bool copySharedToOrig() { return true; }
-
-  //! Mapping functions for interop objects
-  virtual bool mapExtObjectInCQThread() { return true; }
-  virtual bool unmapExtObjectInCQThread() { return true; }
 };
 
 }  // namespace amd
diff --git a/rocclr/runtime/platform/memory.hpp b/rocclr/runtime/platform/memory.hpp
index a70a00644b..53714d58b2 100644
--- a/rocclr/runtime/platform/memory.hpp
+++ b/rocclr/runtime/platform/memory.hpp
@@ -284,19 +284,6 @@ class Memory : public amd::RuntimeObject {
   //! Force an asynchronous writeback from the most-recent dirty cache to host
   void cacheWriteBack(void);
 
-  //! For CPU device only!
-  //! Base functions for mapping/unmapping GL/D3D objects
-  //! Functions may be left empty, if not needed
-  //! Virtual member function mapExtObjectInCQThread() maps a GL object
-  //! and store CPU memory pointer in Memory::hostMem_.
-  //! Returns true if ok, false 0 if error(s)
-  virtual bool mapExtObjectInCQThread(void) { return true; }
-
-  //! Virtual member functions unmapExtObjectInCQThread() unmaps a GL object
-  //! and clears pointer Memory::hostMem_.
-  //! Returns true if ok, false 0 if error(s)
-  virtual bool unmapExtObjectInCQThread(void) { return true; }
-
   //! Returns true if the specified area covers memory intirely
   virtual bool isEntirelyCovered(const Coord3D& origin,  //!< Origin location of the covered region
                                  const Coord3D& region   //!< Covered region dimensions