Skip to content

Commit e320adf

Browse files
committed
Comments applied
1 parent 14827d0 commit e320adf

File tree

4 files changed

+15
-25
lines changed

4 files changed

+15
-25
lines changed

unified-runtime/source/adapters/level_zero/helpers/image_helpers.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@
1212

1313
#ifdef UR_ADAPTER_LEVEL_ZERO_V2
1414
#include "../v2/context.hpp"
15-
#include "../v2/memory.hpp"
1615
#else
1716
#include "../context.hpp"
18-
#include "../memory.hpp"
1917
#endif
20-
2118
#include "../sampler.hpp"
2219
#include "image_helpers.hpp"
2320

unified-runtime/source/adapters/level_zero/helpers/image_helpers.hpp

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct ur_bindless_mem_handle_t {
2727
};
2828

2929
ze_image_handle_t getZeImage() const { return zeImage.get(); }
30-
30+
3131
ze_image_format_t getFormat() const { return format; }
3232
uint64_t getWidth() const { return width; }
3333
uint64_t getHeight() const { return height; }
@@ -51,15 +51,12 @@ ur_result_t getImageRegionHelper(ze_image_desc_t ZeImageDesc,
5151
ur_rect_region_t *Region,
5252
ze_image_region_t &ZeRegion);
5353

54-
55-
ur_result_t bindlessImagesHandleCopyFlags(const void *pSrc, void *pDst,
56-
const ur_image_desc_t *pSrcImageDesc,
57-
const ur_image_desc_t *pDstImageDesc,
58-
const ur_image_format_t *pSrcImageFormat,
59-
const ur_image_format_t *pDstImageFormat,
60-
ur_exp_image_copy_region_t *pCopyRegion,
61-
ur_exp_image_copy_flags_t imageCopyFlags,
62-
ze_command_list_handle_t ZeCommandList,
63-
ze_event_handle_t zeSignalEvent,
64-
uint32_t numWaitEvents,
65-
ze_event_handle_t *phWaitEvents);
54+
ur_result_t bindlessImagesHandleCopyFlags(
55+
const void *pSrc, void *pDst, const ur_image_desc_t *pSrcImageDesc,
56+
const ur_image_desc_t *pDstImageDesc,
57+
const ur_image_format_t *pSrcImageFormat,
58+
const ur_image_format_t *pDstImageFormat,
59+
ur_exp_image_copy_region_t *pCopyRegion,
60+
ur_exp_image_copy_flags_t imageCopyFlags,
61+
ze_command_list_handle_t ZeCommandList, ze_event_handle_t zeSignalEvent,
62+
uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents);

unified-runtime/source/adapters/level_zero/image.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "sampler.hpp"
1818
#include "ur_interface_loader.hpp"
1919

20-
2120
namespace {
2221

2322
bool Is3ChannelOrder(ur_image_channel_order_t ChannelOrder) {
@@ -104,12 +103,11 @@ ur_result_t urBindlessImagesImageCopyExp(
104103

105104
const auto &ZeCommandList = CommandList->first;
106105
const auto &WaitList = (*Event)->WaitList;
107-
108-
auto res =
109-
bindlessImagesHandleCopyFlags(pSrc, pDst, pSrcImageDesc, pDstImageDesc,
110-
pSrcImageFormat, pDstImageFormat, pCopyRegion,
111-
imageCopyFlags, ZeCommandList, ZeEvent,
112-
WaitList.Length, WaitList.ZeEventList);
106+
107+
auto res = bindlessImagesHandleCopyFlags(
108+
pSrc, pDst, pSrcImageDesc, pDstImageDesc, pSrcImageFormat,
109+
pDstImageFormat, pCopyRegion, imageCopyFlags, ZeCommandList, ZeEvent,
110+
WaitList.Length, WaitList.ZeEventList);
113111

114112
if (res == UR_RESULT_SUCCESS)
115113
UR_CALL(hQueue->executeCommandList(CommandList, Blocking, OkToBatch));

unified-runtime/source/adapters/level_zero/image_common.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
#include "common.hpp"
1414
#ifdef UR_ADAPTER_LEVEL_ZERO_V2
1515
#include "v2/context.hpp"
16-
#include "v2/event.hpp"
1716
#else
1817
#include "context.hpp"
19-
#include "event.hpp"
2018
#endif
2119
#include "helpers/image_helpers.hpp"
2220
#include "logger/ur_logger.hpp"

0 commit comments

Comments
 (0)