P4 to Git Change 1275749 by wchau@wchau_WIN_OCL_HSA on 2016/06/02 13:38:16

SWDEV-89502 - [OCL] Support AMD DVR Core functionalities.  Add OCL support for DOPP for desktop and present texture (OCL RT changes)

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#11 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#25 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#316 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#124 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#403 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#16 edit
This commit is contained in:
foreman
2016-06-02 14:36:03 -04:00
parent 436ca8ad4d
commit 914df5dd52
5 changed files with 48 additions and 9 deletions
+9 -3
View File
@@ -1567,7 +1567,7 @@ Kernel::loadParameters(
}
bool
Kernel::run(VirtualGPU& gpu, GpuEvent* calEvent, bool lastRun) const
Kernel::run(VirtualGPU& gpu, GpuEvent* calEvent, bool lastRun, bool lastDoppCmd) const
{
const VirtualGPU::CalVirtualDesc* dispatch = gpu.cal();
@@ -1576,7 +1576,7 @@ Kernel::run(VirtualGPU& gpu, GpuEvent* calEvent, bool lastRun) const
gpu.eventBegin(MainEngine);
gpu.rs()->Dispatch(gpu.cs(), &dispatch->gridBlock, &dispatch->partialGridBlock,
&dispatch->gridSize, dispatch->localSize, gpu.vmMems(), dispatch->memCount_);
&dispatch->gridSize, dispatch->localSize, gpu.vmMems(), dispatch->memCount_, lastDoppCmd);
gpu.eventEnd(MainEngine, *calEvent);
// Unbind all resources
@@ -1889,6 +1889,12 @@ Kernel::setArgument(
copyImageConstants(gpuMem->owner()->asImage(),
reinterpret_cast<ImageConstants*>(memory + arg->cbPos_));
}
// Handle DOPP texture resource
gslMemObject gslMem = gpuMem->gslResource();
if (gslMem->getAttribs().isDOPPDesktopTexture) {
gpu.addVmMemory(gpuMem);
}
}
break;
case KernelArg::Sampler:
@@ -3458,7 +3464,7 @@ HSAILKernel::init(amd::hsa::loader::Symbol *sym, bool finalize)
// Copy wavefront size
workGroupInfo_.wavefrontSize_ = prog().isNull() ? 64 : dev().getAttribs().wavefrontSize;
// Find total workgroup size
if (workGroupInfo_.compileSize_[0] != 0) {
workGroupInfo_.size_ =