From c1ba47105375d77f817c59eb9d9fec981394d0da Mon Sep 17 00:00:00 2001 From: Filip Hazubski Date: Fri, 29 Nov 2019 17:35:31 +0100 Subject: [PATCH] Add minor improvements Change-Id: I39b9b91a73d5fc8a88cfbbe6ba0ceb65e13a2779 Signed-off-by: Filip Hazubski --- runtime/device_queue/device_queue.cpp | 6 +++--- runtime/os_interface/windows/deferrable_deletion_win.cpp | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/runtime/device_queue/device_queue.cpp b/runtime/device_queue/device_queue.cpp index 40e06122ea..8fb13e18fa 100644 --- a/runtime/device_queue/device_queue.cpp +++ b/runtime/device_queue/device_queue.cpp @@ -24,7 +24,6 @@ DeviceQueue::DeviceQueue(Context *context, cl_queue_properties &properties) : DeviceQueue() { this->context = context; this->device = device; - auto &caps = device->getDeviceInfo(); if (context) { context->incRefInternal(); @@ -33,8 +32,9 @@ DeviceQueue::DeviceQueue(Context *context, commandQueueProperties = getCmdQueueProperties(&properties, CL_QUEUE_PROPERTIES); queueSize = getCmdQueueProperties(&properties, CL_QUEUE_SIZE); - if (queueSize == 0) - queueSize = caps.queueOnDevicePreferredSize; + if (queueSize == 0) { + queueSize = device->getDeviceInfo().queueOnDevicePreferredSize; + } allocateResources(); initDeviceQueue(); diff --git a/runtime/os_interface/windows/deferrable_deletion_win.cpp b/runtime/os_interface/windows/deferrable_deletion_win.cpp index 0947ff5664..9e5a31b826 100644 --- a/runtime/os_interface/windows/deferrable_deletion_win.cpp +++ b/runtime/os_interface/windows/deferrable_deletion_win.cpp @@ -17,16 +17,14 @@ DeferrableDeletion *DeferrableDeletion::create(Args... args) { } template DeferrableDeletion *DeferrableDeletion::create(Wddm *wddm, const D3DKMT_HANDLE *handles, uint32_t allocationCount, D3DKMT_HANDLE resourceHandle); -DeferrableDeletionImpl::DeferrableDeletionImpl(Wddm *wddm, const D3DKMT_HANDLE *handles, uint32_t allocationCount, D3DKMT_HANDLE resourceHandle) { - this->wddm = wddm; +DeferrableDeletionImpl::DeferrableDeletionImpl(Wddm *wddm, const D3DKMT_HANDLE *handles, uint32_t allocationCount, D3DKMT_HANDLE resourceHandle) + : wddm(wddm), allocationCount(allocationCount), resourceHandle(resourceHandle) { if (handles) { this->handles = new D3DKMT_HANDLE[allocationCount]; for (uint32_t i = 0; i < allocationCount; i++) { this->handles[i] = handles[i]; } } - this->allocationCount = allocationCount; - this->resourceHandle = resourceHandle; } bool DeferrableDeletionImpl::apply() { bool destroyStatus = wddm->destroyAllocations(handles, allocationCount, resourceHandle);