P4 to Git Change 1195141 by gandryey@gera-dev-w7 on 2015/09/28 15:09:34
SWDEV-77522 - Remove direct references to the Resource object
- In non-VM mode Resource was used as a memory object outside of SW heap
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.cpp#119 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.hpp#39 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuconstbuf.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuconstbuf.hpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#528 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#153 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#298 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#117 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.hpp#49 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprintf.cpp#38 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprintf.hpp#14 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#208 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#60 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#228 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.hpp#84 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#383 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#135 edit
[ROCm/clr commit: 4b23814a4d]
This commit is contained in:
@@ -1201,7 +1201,7 @@ Resource::setBusy(
|
||||
GpuEvent gpuEvent
|
||||
) const
|
||||
{
|
||||
gpu.assignGpuEvent(this, gpuEvent);
|
||||
gpu.assignGpuEvent(gslResource(), gpuEvent);
|
||||
|
||||
// If current resource is a view, then update the parent event as well
|
||||
if (viewOwner_ != NULL) {
|
||||
@@ -1212,7 +1212,7 @@ Resource::setBusy(
|
||||
void
|
||||
Resource::wait(VirtualGPU& gpu, bool waitOnBusyEngine) const
|
||||
{
|
||||
GpuEvent* gpuEvent = gpu.getGpuEvent(this);
|
||||
GpuEvent* gpuEvent = gpu.getGpuEvent(gslResource());
|
||||
|
||||
// Check if we have to wait unconditionally
|
||||
if (!waitOnBusyEngine ||
|
||||
@@ -1781,7 +1781,7 @@ Resource::getActiveRename(VirtualGPU& gpu, GslResourceReference** rename)
|
||||
bool
|
||||
Resource::rename(VirtualGPU& gpu, bool force)
|
||||
{
|
||||
GpuEvent* gpuEvent = gpu.getGpuEvent(this);
|
||||
GpuEvent* gpuEvent = gpu.getGpuEvent(gslResource());
|
||||
if (!gpuEvent->isValid() && !force) {
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user