P4 to Git Change 1177473 by cpaquot@hog-ocl on 2015/08/05 16:07:55

EPR #422059 - [DX11-OpenCL interop][MAYA] OpenCL doesn't update
	We need to add a Dx->Flush() before ending the query to make sure the DX driver flushes all the GPU caches.

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

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d10.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d11.cpp#17 edit

opencl/api/opencl/amdocl/cl_d3d10.cpp

@@ -1458,6 +1458,7 @@ D3D10Object::copyOrigToShared()
         pD3D10ResOrig_, subRes_, NULL);
 
     // Flush D3D queues and make sure D3D stuff is finished
+    d3dDev->Flush();
     pQuery_->End();
     BOOL data;
     while(S_OK != pQuery_->GetData(&data, sizeof(BOOL), 0) && data != TRUE)

opencl/api/opencl/amdocl/cl_d3d11.cpp

@@ -1002,6 +1002,7 @@ D3D11Object::copyOrigToShared()
      // Flush D3D queues and make sure D3D stuff is finished
     {
         ScopedLock sl(resLock_);//protect from multiple 
+        pImmediateContext->Flush();
         pImmediateContext->End(pQuery_);
         BOOL data;
         while(S_OK != pImmediateContext->GetData(pQuery_, &data, sizeof(BOOL), 0) && data != TRUE)