P4 to Git Change 1338072 by wchau@wchau_WIN_OCL_HSA on 2016/11/08 10:02:39

SWDEV-95007 - OpenCL on PAL - DVR

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#14 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevicegl.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palresource.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palresource.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.hpp#16 edit

rocclr/runtime/device/pal/palresource.cpp

@@ -410,7 +410,7 @@ Resource::memTypeToHeap(Pal::GpuMemoryCreateInfo* createInfo)
         break;
     default:
         createInfo->heaps[0] = Pal::GpuHeapLocal;
-        break;    
+        break;
     }
 }
 
@@ -512,9 +512,11 @@ Resource::create(MemoryType memType, CreateParams* params)
             mipLevel = oglRes->mipLevel_;
 
             if (!dev().resGLAssociate(oglRes->glPlatformContext_, oglRes->handle_,
-                    glType_, &openInfo.hExternalResource, &glInteropMbRes_, &offset_)) {
+                    glType_, &openInfo.hExternalResource, &glInteropMbRes_, &offset_,
+                    openInfo.doppDesktopInfo)) {
                 return false;
             }
+            desc_.isDoppTexture_ = (openInfo.doppDesktopInfo.gpuVirtAddr != 0);
         }
         else {
             D3DInteropParams* d3dRes = reinterpret_cast<D3DInteropParams*>(params);
@@ -849,7 +851,7 @@ Resource::create(MemoryType memType, CreateParams* params)
             imgCreateInfo.fragments = 1;
             Pal::ImageTiling    tiling =  Pal::ImageTiling::Optimal;
 
-            if (((memoryType() == Persistent) && 
+            if (((memoryType() == Persistent) &&
                  dev().settings().linearPersistentImage_) ||
                 (memoryType() == ImageBuffer)) {
                 tiling    = Pal::ImageTiling::Linear;
@@ -1275,7 +1277,7 @@ Resource::partialMemCopyTo(
         if (((copyRegion.gpuMemoryRowPitch % 4) != 0) ||
             // another DRM restriciton... SI has 4 pixels
             (copyRegion.gpuMemoryOffset % 4 != 0) ||
-            (dev().settings().sdamPageFaultWar_ && 
+            (dev().settings().sdamPageFaultWar_ &&
              (copyRegion.imageOffset.x % dstResource.elementSize() != 0))) {
             result = false;
         }