P4 to Git Change 1151968 by skudchad@skudchad_test_win_opencl2 on 2015/05/18 20:09:41

EPR #403782 - IOMMU2/SVM
	- Disable DX interop on SVM. This is a feature for SVM and may need more work.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/7555/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#310 edit

rocclr/runtime/device/gpu/gpusettings.cpp

@@ -398,11 +398,6 @@ Settings::create(
     enableExtension(ClAmdMediaOps);
     enableExtension(ClAmdMediaOps2);
     enableExtension(ClAmdPopcnt);
-#if defined(_WIN32)
-    enableExtension(ClKhrD3d9Sharing);
-    enableExtension(ClKhrD3d10Sharing);
-    enableExtension(ClKhrD3d11Sharing);
-#endif // _WIN32
     enableExtension(ClKhr3DImageWrites);
     enableExtension(ClAmdVec3);
     enableExtension(ClAmdPrintf);
@@ -464,6 +459,15 @@ Settings::create(
 
     enableExtension(ClKhrSpir);
 
+    // SVM is not currently supported for DX Interop
+    if (!svmFineGrainSystem_) {
+#if defined(_WIN32)
+        enableExtension(ClKhrD3d9Sharing);
+        enableExtension(ClKhrD3d10Sharing);
+        enableExtension(ClKhrD3d11Sharing);
+#endif // _WIN32
+    }
+
     // Enable some OpenCL 2.0 extensions
     if (oclVersion_ >= OpenCL20) {
         enableExtension(ClKhrGLDepthImages);