Skip to content

Commit

Permalink
Fix merge formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacault committed Feb 23, 2024
1 parent 77113e3 commit 217545a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion sycl/include/sycl/detail/image_ocl_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static RetType __invoke__ImageRead(ImageT Img, CoordT Coords) {

template <typename RetType, typename ImageT, typename CoordT>
static RetType __invoke__ImageArrayFetch(ImageT Img, CoordT Coords,
int ArrayLayer) {
int ArrayLayer) {

// Convert from sycl types to builtin types to get correct function mangling.
using TempRetT = sycl::detail::ConvertToOpenCLType_t<RetType>;
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/ext/oneapi/bindless_images.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ DataT fetch_image_array(const unsampled_image_handle &imageHandle
#ifdef __SYCL_DEVICE_ONLY__
if constexpr (detail::is_recognized_standard_type<DataT>()) {
return __invoke__ImageArrayFetch<DataT>(imageHandle.raw_handle, coords,
arrayLayer);
arrayLayer);
} else {
static_assert(sizeof(HintT) == sizeof(DataT),
"When trying to fetch a user-defined type, HintT must be of "
Expand Down

0 comments on commit 217545a

Please sign in to comment.