Skip to content

A
angle
Commit 1891af05 by John Plate Committed by Angle LUCI CQ
Options

CL: Refactor TRY macro and fix more conformance bugs

Bug: angleproject:6015 Change-Id: Id54be19822fec2ac5584ffe1d1cf5bb8f00c9094 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2967467Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: John Plate <jplate@google.com>
parent b239790f
Showing with 230 additions and 179 deletions
src/libANGLE/CLtypes.h
...@@ -25,6 +25,16 @@ ...@@ -25,6 +25,16 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#define ANGLE_CL_TRY(expression) \
do \
{ \
const cl_int _errorCode = expression; \
if (_errorCode != CL_SUCCESS) \
{ \
return _errorCode; \
} \
} while (0)
namespace cl namespace cl
{ {
......
src/libANGLE/cl_utils.cpp
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
// //
// cl_utils.cpp: Helper functions for the CL front end // cl_utils.cpp: Helper functions for the CL front end
#include <libANGLE/cl_utils.h> #include "libANGLE/cl_utils.h"
#include "libANGLE/renderer/CLExtensions.h"
namespace cl namespace cl
{ {
...@@ -85,4 +87,100 @@ size_t GetElementSize(const cl_image_format &image_format) ...@@ -85,4 +87,100 @@ size_t GetElementSize(const cl_image_format &image_format)
return size; return size;
} }
bool IsValidImageFormat(const cl_image_format *imageFormat, const rx::CLExtensions &extensions)
{
if (imageFormat == nullptr)
{
return false;
}
switch (imageFormat->image_channel_order)
{
case CL_R:
case CL_A:
case CL_LUMINANCE:
case CL_INTENSITY:
case CL_RG:
case CL_RA:
case CL_RGB:
case CL_RGBA:
case CL_ARGB:
case CL_BGRA:
break;
case CL_Rx:
case CL_RGx:
case CL_RGBx:
if (extensions.version < CL_MAKE_VERSION(1, 1, 0))
{
return false;
}
break;
case CL_ABGR:
case CL_sRGB:
case CL_sRGBA:
case CL_sBGRA:
case CL_sRGBx:
if (extensions.version < CL_MAKE_VERSION(2, 0, 0))
{
return false;
}
break;
case CL_DEPTH:
// CL_DEPTH can only be used if channel data type = CL_UNORM_INT16 or CL_FLOAT.
if (imageFormat->image_channel_data_type != CL_UNORM_INT16 &&
imageFormat->image_channel_data_type != CL_FLOAT)
{
return false;
}
if (!extensions.khrDepthImages)
{
return false;
}
break;
default:
return false;
}
switch (imageFormat->image_channel_data_type)
{
case CL_SNORM_INT8:
case CL_SNORM_INT16:
case CL_UNORM_INT8:
case CL_UNORM_INT16:
case CL_SIGNED_INT8:
case CL_SIGNED_INT16:
case CL_SIGNED_INT32:
case CL_UNSIGNED_INT8:
case CL_UNSIGNED_INT16:
case CL_UNSIGNED_INT32:
case CL_HALF_FLOAT:
case CL_FLOAT:
break;
case CL_UNORM_SHORT_565:
case CL_UNORM_SHORT_555:
case CL_UNORM_INT_101010:
if (imageFormat->image_channel_order != CL_RGB &&
imageFormat->image_channel_order != CL_RGBx)
{
return false;
}
break;
case CL_UNORM_INT_101010_2:
if (extensions.version < CL_MAKE_VERSION(2, 1, 0) ||
imageFormat->image_channel_order != CL_RGBA)
{
return false;
}
break;
default:
return false;
}
return true;
}
} // namespace cl } // namespace cl
src/libANGLE/cl_utils.h
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#ifndef LIBANGLE_CL_UTILS_H_ #ifndef LIBANGLE_CL_UTILS_H_
#define LIBANGLE_CL_UTILS_H_ #define LIBANGLE_CL_UTILS_H_
#include "libANGLE/CLtypes.h" #include "libANGLE/renderer/CLtypes.h"
namespace cl namespace cl
{ {
...@@ -26,6 +26,8 @@ inline bool OverlapRegions(size_t offset1, size_t offset2, size_t size) ...@@ -26,6 +26,8 @@ inline bool OverlapRegions(size_t offset1, size_t offset2, size_t size)
(offset2 <= offset1 && offset1 <= offset2 + size - 1u); (offset2 <= offset1 && offset1 <= offset2 + size - 1u);
} }
bool IsValidImageFormat(const cl_image_format *imageFormat, const rx::CLExtensions &extensions);
} // namespace cl } // namespace cl
#endif // LIBANGLE_CL_UTILS_H_ #endif // LIBANGLE_CL_UTILS_H_
src/libANGLE/renderer/CLDeviceImpl.h
...@@ -57,11 +57,8 @@ class CLDeviceImpl : angle::NonCopyable ...@@ -57,11 +57,8 @@ class CLDeviceImpl : angle::NonCopyable
cl_uint queueOnDeviceMaxSize = 0u; cl_uint queueOnDeviceMaxSize = 0u;
std::string builtInKernels; std::string builtInKernels;
NameVersionVector builtInKernelsWithVersion; NameVersionVector builtInKernelsWithVersion;
std::string versionStr;
cl_version version = 0u;
NameVersionVector OpenCL_C_AllVersions; NameVersionVector OpenCL_C_AllVersions;
NameVersionVector OpenCL_C_Features; NameVersionVector OpenCL_C_Features;
NameVersionVector extensionsWithVersion;
std::vector<cl_device_partition_property> partitionProperties; std::vector<cl_device_partition_property> partitionProperties;
std::vector<cl_device_partition_property> partitionType; std::vector<cl_device_partition_property> partitionType;
}; };
......
src/libANGLE/renderer/CLExtensions.h
...@@ -26,7 +26,11 @@ struct CLExtensions ...@@ -26,7 +26,11 @@ struct CLExtensions
void initializeExtensions(std::string &&extensionStr); void initializeExtensions(std::string &&extensionStr);
std::string versionStr;
cl_version version = 0u;
std::string extensions; std::string extensions;
NameVersionVector extensionsWithVersion;
// These Khronos extension names must be returned by all devices that support OpenCL 1.1. // These Khronos extension names must be returned by all devices that support OpenCL 1.1.
bool khrByteAddressableStore = false; // cl_khr_byte_addressable_store bool khrByteAddressableStore = false; // cl_khr_byte_addressable_store
......
src/libANGLE/renderer/CLPlatformImpl.h
...@@ -36,10 +36,7 @@ class CLPlatformImpl : angle::NonCopyable ...@@ -36,10 +36,7 @@ class CLPlatformImpl : angle::NonCopyable
bool isValid() const { return version != 0u; } bool isValid() const { return version != 0u; }
std::string profile; std::string profile;
std::string versionStr;
cl_version version = 0u;
std::string name; std::string name;
NameVersionVector extensionsWithVersion;
cl_ulong hostTimerRes = 0u; cl_ulong hostTimerRes = 0u;
}; };
......
src/libANGLE/renderer/CLtypes.h
...@@ -13,9 +13,17 @@ ...@@ -13,9 +13,17 @@
namespace rx namespace rx
{ {
class CLCommandQueueImpl;
class CLContextImpl; class CLContextImpl;
class CLDeviceImpl; class CLDeviceImpl;
class CLEventImpl;
class CLKernelImpl;
class CLMemoryImpl;
class CLPlatformImpl; class CLPlatformImpl;
class CLProgramImpl;
class CLSamplerImpl;
struct CLExtensions;
using NameVersionVector = std::vector<cl_name_version>; using NameVersionVector = std::vector<cl_name_version>;
......
src/libANGLE/renderer/cl/CLCommandQueueCL.cpp
...@@ -446,6 +446,14 @@ void *CLCommandQueueCL::enqueueMapImage(const cl::Image &image, ...@@ -446,6 +446,14 @@ void *CLCommandQueueCL::enqueueMapImage(const cl::Image &image,
mNative, nativeImage, block, mapFlags.get(), origin, region, imageRowPitch, imageSlicePitch, mNative, nativeImage, block, mapFlags.get(), origin, region, imageRowPitch, imageSlicePitch,
numEvents, nativeEventsPtr, nativeEventPtr, &errorCode); numEvents, nativeEventsPtr, nativeEventPtr, &errorCode);
// TODO(jplate) Remove workaround after bug is fixed http://anglebug.com/6066
if (imageSlicePitch != nullptr && (image.getType() == cl::MemObjectType::Image1D ||
image.getType() == cl::MemObjectType::Image1D_Buffer ||
image.getType() == cl::MemObjectType::Image2D))
{
*imageSlicePitch = 0u;
}
CheckCreateEvent(errorCode, nativeEvent, eventCreateFunc); CheckCreateEvent(errorCode, nativeEvent, eventCreateFunc);
return map; return map;
} }
......
src/libANGLE/renderer/cl/CLContextCL.cpp
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "libANGLE/renderer/cl/CLDeviceCL.h" #include "libANGLE/renderer/cl/CLDeviceCL.h"
#include "libANGLE/renderer/cl/CLEventCL.h" #include "libANGLE/renderer/cl/CLEventCL.h"
#include "libANGLE/renderer/cl/CLMemoryCL.h" #include "libANGLE/renderer/cl/CLMemoryCL.h"
#include "libANGLE/renderer/cl/CLPlatformCL.h"
#include "libANGLE/renderer/cl/CLProgramCL.h" #include "libANGLE/renderer/cl/CLProgramCL.h"
#include "libANGLE/renderer/cl/CLSamplerCL.h" #include "libANGLE/renderer/cl/CLSamplerCL.h"
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
#include "libANGLE/CLPlatform.h" #include "libANGLE/CLPlatform.h"
#include "libANGLE/CLProgram.h" #include "libANGLE/CLProgram.h"
#include "libANGLE/CLSampler.h" #include "libANGLE/CLSampler.h"
#include "libANGLE/cl_utils.h"
namespace rx namespace rx
{ {
...@@ -185,8 +187,35 @@ cl_int CLContextCL::getSupportedImageFormats(cl::MemFlags flags, ...@@ -185,8 +187,35 @@ cl_int CLContextCL::getSupportedImageFormats(cl::MemFlags flags,
cl_image_format *imageFormats, cl_image_format *imageFormats,
cl_uint *numImageFormats) cl_uint *numImageFormats)
{ {
return mNative->getDispatch().clGetSupportedImageFormats( // Fetch available image formats for given flags and image type.
mNative, flags.get(), cl::ToCLenum(imageType), numEntries, imageFormats, numImageFormats); cl_uint numFormats = 0u;
ANGLE_CL_TRY(mNative->getDispatch().clGetSupportedImageFormats(
mNative, flags.get(), cl::ToCLenum(imageType), 0u, nullptr, &numFormats));
std::vector<cl_image_format> formats(numFormats);
ANGLE_CL_TRY(mNative->getDispatch().clGetSupportedImageFormats(
mNative, flags.get(), cl::ToCLenum(imageType), numFormats, formats.data(), nullptr));
// Filter out formats which are not supported by front end.
const CLPlatformImpl::Info &info = mContext.getPlatform().getInfo();
std::vector<cl_image_format> supportedFormats;
supportedFormats.reserve(formats.size());
std::copy_if(
formats.cbegin(), formats.cend(), std::back_inserter(supportedFormats),
[&](const cl_image_format &format) { return cl::IsValidImageFormat(&format, info); });
if (imageFormats != nullptr)
{
auto formatIt = supportedFormats.cbegin();
while (numEntries-- != 0u && formatIt != supportedFormats.cend())
{
*imageFormats++ = *formatIt++;
}
}
if (numImageFormats != nullptr)
{
*numImageFormats = static_cast<cl_uint>(supportedFormats.size());
}
return CL_SUCCESS;
} }
CLSamplerImpl::Ptr CLContextCL::createSampler(const cl::Sampler &sampler, cl_int &errorCode) CLSamplerImpl::Ptr CLContextCL::createSampler(const cl::Sampler &sampler, cl_int &errorCode)
......
src/libANGLE/renderer/cl/CLPlatformCL.cpp
...@@ -394,7 +394,6 @@ CLContextImpl::Ptr CLPlatformCL::createContext(cl::Context &context, ...@@ -394,7 +394,6 @@ CLContextImpl::Ptr CLPlatformCL::createContext(cl::Context &context,
nativeDevices.emplace_back(device->getImpl<CLDeviceCL>().getNative()); nativeDevices.emplace_back(device->getImpl<CLDeviceCL>().getNative());
} }
CLContextImpl::Ptr contextImpl;
cl_context nativeContext = mNative->getDispatch().clCreateContext( cl_context nativeContext = mNative->getDispatch().clCreateContext(
properties, static_cast<cl_uint>(nativeDevices.size()), nativeDevices.data(), properties, static_cast<cl_uint>(nativeDevices.size()), nativeDevices.data(),
cl::Context::ErrorCallback, &context, &errorCode); cl::Context::ErrorCallback, &context, &errorCode);
......
src/libANGLE/validationCL.cpp
...@@ -29,16 +29,6 @@ ...@@ -29,16 +29,6 @@
} \ } \
} while (0) } while (0)
#define ANGLE_TRY(expression) \
do \
{ \
const cl_int errorCode = expression; \
if (errorCode != CL_SUCCESS) \
{ \
return errorCode; \
} \
} while (0)
namespace cl namespace cl
{ {
...@@ -175,101 +165,6 @@ bool ValidateMemoryProperties(const cl_mem_properties *properties) ...@@ -175,101 +165,6 @@ bool ValidateMemoryProperties(const cl_mem_properties *properties)
return true; return true;
} }
bool ValidateImageFormat(const cl_image_format *imageFormat, const Platform &platform)
{
if (imageFormat == nullptr)
{
return false;
}
switch (imageFormat->image_channel_order)
{
case CL_R:
case CL_A:
case CL_LUMINANCE:
case CL_INTENSITY:
case CL_RG:
case CL_RA:
case CL_RGB:
case CL_RGBA:
case CL_ARGB:
case CL_BGRA:
break;
case CL_Rx:
case CL_RGx:
case CL_RGBx:
if (!platform.isVersionOrNewer(1u, 1u))
{
return false;
}
break;
case CL_ABGR:
case CL_sRGB:
case CL_sRGBA:
case CL_sBGRA:
case CL_sRGBx:
if (!platform.isVersionOrNewer(2u, 0u))
{
return false;
}
break;
case CL_DEPTH:
// CL_DEPTH can only be used if channel data type = CL_UNORM_INT16 or CL_FLOAT.
if (imageFormat->image_channel_data_type != CL_UNORM_INT16 &&
imageFormat->image_channel_data_type != CL_FLOAT)
{
return false;
}
if (!platform.getInfo().khrDepthImages)
{
return false;
}
break;
default:
return false;
}
switch (imageFormat->image_channel_data_type)
{
case CL_SNORM_INT8:
case CL_SNORM_INT16:
case CL_UNORM_INT8:
case CL_UNORM_INT16:
case CL_SIGNED_INT8:
case CL_SIGNED_INT16:
case CL_SIGNED_INT32:
case CL_UNSIGNED_INT8:
case CL_UNSIGNED_INT16:
case CL_UNSIGNED_INT32:
case CL_HALF_FLOAT:
case CL_FLOAT:
break;
case CL_UNORM_SHORT_565:
case CL_UNORM_SHORT_555:
case CL_UNORM_INT_101010:
if (imageFormat->image_channel_order != CL_RGB &&
imageFormat->image_channel_order != CL_RGBx)
{
return false;
}
break;
case CL_UNORM_INT_101010_2:
if (!platform.isVersionOrNewer(2u, 1u) || imageFormat->image_channel_order != CL_RGBA)
{
return false;
}
break;
default:
return false;
}
return true;
}
cl_int ValidateCommandQueueAndEventWaitList(cl_command_queue commandQueue, cl_int ValidateCommandQueueAndEventWaitList(cl_command_queue commandQueue,
bool validateImageSupport, bool validateImageSupport,
cl_uint numEvents, cl_uint numEvents,
...@@ -572,6 +467,8 @@ cl_int ValidateHostRegionForImage(const Image &image, ...@@ -572,6 +467,8 @@ cl_int ValidateHostRegionForImage(const Image &image,
} }
if (slicePitch != 0u) if (slicePitch != 0u)
{ {
// TODO(jplate) Follow up with https://github.com/KhronosGroup/OpenCL-Docs/issues/624
// This error is missing in the OpenCL spec.
// slice_pitch must be 0 if image is a 1D or 2D image. // slice_pitch must be 0 if image is a 1D or 2D image.
if (image.getType() == MemObjectType::Image1D || if (image.getType() == MemObjectType::Image1D ||
image.getType() == MemObjectType::Image1D_Buffer || image.getType() == MemObjectType::Image1D_Buffer ||
...@@ -791,7 +688,7 @@ cl_int ValidateCreateContext(const cl_context_properties *properties, ...@@ -791,7 +688,7 @@ cl_int ValidateCreateContext(const cl_context_properties *properties,
const void *user_data) const void *user_data)
{ {
const Platform *platform = nullptr; const Platform *platform = nullptr;
ANGLE_TRY(ValidateContextProperties(properties, platform)); ANGLE_CL_TRY(ValidateContextProperties(properties, platform));
// CL_INVALID_VALUE if devices is NULL or if num_devices is equal to zero // CL_INVALID_VALUE if devices is NULL or if num_devices is equal to zero
// or if pfn_notify is NULL but user_data is not NULL. // or if pfn_notify is NULL but user_data is not NULL.
...@@ -822,7 +719,7 @@ cl_int ValidateCreateContextFromType(const cl_context_properties *properties, ...@@ -822,7 +719,7 @@ cl_int ValidateCreateContextFromType(const cl_context_properties *properties,
const void *user_data) const void *user_data)
{ {
const Platform *platform = nullptr; const Platform *platform = nullptr;
ANGLE_TRY(ValidateContextProperties(properties, platform)); ANGLE_CL_TRY(ValidateContextProperties(properties, platform));
// CL_INVALID_DEVICE_TYPE if device_type is not a valid value. // CL_INVALID_DEVICE_TYPE if device_type is not a valid value.
if (!Device::IsValidType(device_type)) if (!Device::IsValidType(device_type))
...@@ -1703,9 +1600,9 @@ cl_int ValidateEnqueueReadBuffer(cl_command_queue command_queue, ...@@ -1703,9 +1600,9 @@ cl_int ValidateEnqueueReadBuffer(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
ANGLE_TRY(ValidateEnqueueBuffer(command_queue->cast<CommandQueue>(), buffer, true, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(command_queue->cast<CommandQueue>(), buffer, true, false));
// CL_INVALID_VALUE if the region being read or written specified // CL_INVALID_VALUE if the region being read or written specified
// by (offset, size) is out of bounds or if ptr is a NULL value. // by (offset, size) is out of bounds or if ptr is a NULL value.
...@@ -1727,9 +1624,9 @@ cl_int ValidateEnqueueWriteBuffer(cl_command_queue command_queue, ...@@ -1727,9 +1624,9 @@ cl_int ValidateEnqueueWriteBuffer(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
ANGLE_TRY(ValidateEnqueueBuffer(command_queue->cast<CommandQueue>(), buffer, false, true)); ANGLE_CL_TRY(ValidateEnqueueBuffer(command_queue->cast<CommandQueue>(), buffer, false, true));
// CL_INVALID_VALUE if the region being read or written specified // CL_INVALID_VALUE if the region being read or written specified
// by (offset, size) is out of bounds or if ptr is a NULL value. // by (offset, size) is out of bounds or if ptr is a NULL value.
...@@ -1751,14 +1648,14 @@ cl_int ValidateEnqueueCopyBuffer(cl_command_queue command_queue, ...@@ -1751,14 +1648,14 @@ cl_int ValidateEnqueueCopyBuffer(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
ANGLE_TRY(ValidateEnqueueBuffer(queue, src_buffer, false, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, src_buffer, false, false));
const Buffer &src = src_buffer->cast<Buffer>(); const Buffer &src = src_buffer->cast<Buffer>();
ANGLE_TRY(ValidateEnqueueBuffer(queue, dst_buffer, false, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, dst_buffer, false, false));
const Buffer &dst = dst_buffer->cast<Buffer>(); const Buffer &dst = dst_buffer->cast<Buffer>();
// CL_INVALID_VALUE if src_offset, dst_offset, size, src_offset + size or dst_offset + size // CL_INVALID_VALUE if src_offset, dst_offset, size, src_offset + size or dst_offset + size
...@@ -1799,15 +1696,15 @@ cl_int ValidateEnqueueReadImage(cl_command_queue command_queue, ...@@ -1799,15 +1696,15 @@ cl_int ValidateEnqueueReadImage(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
ANGLE_TRY(ValidateEnqueueImage(queue, image, true, false)); ANGLE_CL_TRY(ValidateEnqueueImage(queue, image, true, false));
const Image &img = image->cast<Image>(); const Image &img = image->cast<Image>();
ANGLE_TRY(ValidateImageForDevice(img, queue.getDevice(), origin, region)); ANGLE_CL_TRY(ValidateImageForDevice(img, queue.getDevice(), origin, region));
ANGLE_TRY(ValidateHostRegionForImage(img, region, row_pitch, slice_pitch, ptr)); ANGLE_CL_TRY(ValidateHostRegionForImage(img, region, row_pitch, slice_pitch, ptr));
return CL_SUCCESS; return CL_SUCCESS;
} }
...@@ -1824,15 +1721,15 @@ cl_int ValidateEnqueueWriteImage(cl_command_queue command_queue, ...@@ -1824,15 +1721,15 @@ cl_int ValidateEnqueueWriteImage(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
ANGLE_TRY(ValidateEnqueueImage(queue, image, false, true)); ANGLE_CL_TRY(ValidateEnqueueImage(queue, image, false, true));
const Image &img = image->cast<Image>(); const Image &img = image->cast<Image>();
ANGLE_TRY(ValidateImageForDevice(img, queue.getDevice(), origin, region)); ANGLE_CL_TRY(ValidateImageForDevice(img, queue.getDevice(), origin, region));
ANGLE_TRY(ValidateHostRegionForImage(img, region, input_row_pitch, input_slice_pitch, ptr)); ANGLE_CL_TRY(ValidateHostRegionForImage(img, region, input_row_pitch, input_slice_pitch, ptr));
return CL_SUCCESS; return CL_SUCCESS;
} }
...@@ -1847,14 +1744,14 @@ cl_int ValidateEnqueueCopyImage(cl_command_queue command_queue, ...@@ -1847,14 +1744,14 @@ cl_int ValidateEnqueueCopyImage(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
ANGLE_TRY(ValidateEnqueueImage(queue, src_image, false, false)); ANGLE_CL_TRY(ValidateEnqueueImage(queue, src_image, false, false));
const Image &src = src_image->cast<Image>(); const Image &src = src_image->cast<Image>();
ANGLE_TRY(ValidateEnqueueImage(queue, dst_image, false, false)); ANGLE_CL_TRY(ValidateEnqueueImage(queue, dst_image, false, false));
const Image &dst = dst_image->cast<Image>(); const Image &dst = dst_image->cast<Image>();
// CL_IMAGE_FORMAT_MISMATCH if src_image and dst_image do not use the same image format. // CL_IMAGE_FORMAT_MISMATCH if src_image and dst_image do not use the same image format.
...@@ -1864,8 +1761,8 @@ cl_int ValidateEnqueueCopyImage(cl_command_queue command_queue, ...@@ -1864,8 +1761,8 @@ cl_int ValidateEnqueueCopyImage(cl_command_queue command_queue,
return CL_IMAGE_FORMAT_MISMATCH; return CL_IMAGE_FORMAT_MISMATCH;
} }
ANGLE_TRY(ValidateImageForDevice(src, queue.getDevice(), src_origin, region)); ANGLE_CL_TRY(ValidateImageForDevice(src, queue.getDevice(), src_origin, region));
ANGLE_TRY(ValidateImageForDevice(dst, queue.getDevice(), dst_origin, region)); ANGLE_CL_TRY(ValidateImageForDevice(dst, queue.getDevice(), dst_origin, region));
// CL_MEM_COPY_OVERLAP if src_image and dst_image are the same image object // CL_MEM_COPY_OVERLAP if src_image and dst_image are the same image object
// and the source and destination regions overlap. // and the source and destination regions overlap.
...@@ -1910,14 +1807,14 @@ cl_int ValidateEnqueueCopyImageToBuffer(cl_command_queue command_queue, ...@@ -1910,14 +1807,14 @@ cl_int ValidateEnqueueCopyImageToBuffer(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
ANGLE_TRY(ValidateEnqueueImage(queue, src_image, false, false)); ANGLE_CL_TRY(ValidateEnqueueImage(queue, src_image, false, false));
const Image &src = src_image->cast<Image>(); const Image &src = src_image->cast<Image>();
ANGLE_TRY(ValidateEnqueueBuffer(queue, dst_buffer, false, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, dst_buffer, false, false));
const Buffer &dst = dst_buffer->cast<Buffer>(); const Buffer &dst = dst_buffer->cast<Buffer>();
// CL_INVALID_MEM_OBJECT if src_image is a 1D image buffer object created from dst_buffer. // CL_INVALID_MEM_OBJECT if src_image is a 1D image buffer object created from dst_buffer.
...@@ -1926,7 +1823,7 @@ cl_int ValidateEnqueueCopyImageToBuffer(cl_command_queue command_queue, ...@@ -1926,7 +1823,7 @@ cl_int ValidateEnqueueCopyImageToBuffer(cl_command_queue command_queue,
return CL_INVALID_MEM_OBJECT; return CL_INVALID_MEM_OBJECT;
} }
ANGLE_TRY(ValidateImageForDevice(src, queue.getDevice(), src_origin, region)); ANGLE_CL_TRY(ValidateImageForDevice(src, queue.getDevice(), src_origin, region));
// CL_INVALID_VALUE if the region specified by dst_offset and dst_offset + dst_cb // CL_INVALID_VALUE if the region specified by dst_offset and dst_offset + dst_cb
// refer to a region outside dst_buffer. // refer to a region outside dst_buffer.
...@@ -1958,14 +1855,14 @@ cl_int ValidateEnqueueCopyBufferToImage(cl_command_queue command_queue, ...@@ -1958,14 +1855,14 @@ cl_int ValidateEnqueueCopyBufferToImage(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
ANGLE_TRY(ValidateEnqueueBuffer(queue, src_buffer, false, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, src_buffer, false, false));
const Buffer &src = src_buffer->cast<Buffer>(); const Buffer &src = src_buffer->cast<Buffer>();
ANGLE_TRY(ValidateEnqueueImage(queue, dst_image, false, false)); ANGLE_CL_TRY(ValidateEnqueueImage(queue, dst_image, false, false));
const Image &dst = dst_image->cast<Image>(); const Image &dst = dst_image->cast<Image>();
// CL_INVALID_MEM_OBJECT if dst_image is a 1D image buffer object created from src_buffer. // CL_INVALID_MEM_OBJECT if dst_image is a 1D image buffer object created from src_buffer.
...@@ -1974,7 +1871,7 @@ cl_int ValidateEnqueueCopyBufferToImage(cl_command_queue command_queue, ...@@ -1974,7 +1871,7 @@ cl_int ValidateEnqueueCopyBufferToImage(cl_command_queue command_queue,
return CL_INVALID_MEM_OBJECT; return CL_INVALID_MEM_OBJECT;
} }
ANGLE_TRY(ValidateImageForDevice(dst, queue.getDevice(), dst_origin, region)); ANGLE_CL_TRY(ValidateImageForDevice(dst, queue.getDevice(), dst_origin, region));
// CL_INVALID_VALUE if the region specified by src_offset and src_offset + src_cb // CL_INVALID_VALUE if the region specified by src_offset and src_offset + src_cb
// refer to a region outside src_buffer. // refer to a region outside src_buffer.
...@@ -2006,7 +1903,7 @@ cl_int ValidateEnqueueMapBuffer(cl_command_queue command_queue, ...@@ -2006,7 +1903,7 @@ cl_int ValidateEnqueueMapBuffer(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
...@@ -2014,7 +1911,7 @@ cl_int ValidateEnqueueMapBuffer(cl_command_queue command_queue, ...@@ -2014,7 +1911,7 @@ cl_int ValidateEnqueueMapBuffer(cl_command_queue command_queue,
// CL_MEM_HOST_NO_ACCESS and CL_MAP_READ is set in map_flags // CL_MEM_HOST_NO_ACCESS and CL_MAP_READ is set in map_flags
// or if buffer has been created with CL_MEM_HOST_READ_ONLY or CL_MEM_HOST_NO_ACCESS // or if buffer has been created with CL_MEM_HOST_READ_ONLY or CL_MEM_HOST_NO_ACCESS
// and CL_MAP_WRITE or CL_MAP_WRITE_INVALIDATE_REGION is set in map_flags. // and CL_MAP_WRITE or CL_MAP_WRITE_INVALIDATE_REGION is set in map_flags.
ANGLE_TRY( ANGLE_CL_TRY(
ValidateEnqueueBuffer(queue, buffer, map_flags.isSet(CL_MAP_READ), ValidateEnqueueBuffer(queue, buffer, map_flags.isSet(CL_MAP_READ),
map_flags.isSet(CL_MAP_WRITE | CL_MAP_WRITE_INVALIDATE_REGION))); map_flags.isSet(CL_MAP_WRITE | CL_MAP_WRITE_INVALIDATE_REGION)));
...@@ -2041,7 +1938,7 @@ cl_int ValidateEnqueueMapImage(cl_command_queue command_queue, ...@@ -2041,7 +1938,7 @@ cl_int ValidateEnqueueMapImage(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
...@@ -2049,11 +1946,12 @@ cl_int ValidateEnqueueMapImage(cl_command_queue command_queue, ...@@ -2049,11 +1946,12 @@ cl_int ValidateEnqueueMapImage(cl_command_queue command_queue,
// CL_MEM_HOST_NO_ACCESS and CL_MAP_READ is set in map_flags // CL_MEM_HOST_NO_ACCESS and CL_MAP_READ is set in map_flags
// or if image has been created with CL_MEM_HOST_READ_ONLY or CL_MEM_HOST_NO_ACCESS // or if image has been created with CL_MEM_HOST_READ_ONLY or CL_MEM_HOST_NO_ACCESS
// and CL_MAP_WRITE or CL_MAP_WRITE_INVALIDATE_REGION is set in map_flags. // and CL_MAP_WRITE or CL_MAP_WRITE_INVALIDATE_REGION is set in map_flags.
ANGLE_TRY(ValidateEnqueueImage(queue, image, map_flags.isSet(CL_MAP_READ), ANGLE_CL_TRY(
ValidateEnqueueImage(queue, image, map_flags.isSet(CL_MAP_READ),
map_flags.isSet(CL_MAP_WRITE | CL_MAP_WRITE_INVALIDATE_REGION))); map_flags.isSet(CL_MAP_WRITE | CL_MAP_WRITE_INVALIDATE_REGION)));
const Image &img = image->cast<Image>(); const Image &img = image->cast<Image>();
ANGLE_TRY(ValidateImageForDevice(img, queue.getDevice(), origin, region)); ANGLE_CL_TRY(ValidateImageForDevice(img, queue.getDevice(), origin, region));
// CL_INVALID_VALUE if values specified in map_flags are not valid. // CL_INVALID_VALUE if values specified in map_flags are not valid.
if (!ValidateMapFlags(map_flags, queue.getContext().getPlatform())) if (!ValidateMapFlags(map_flags, queue.getContext().getPlatform()))
...@@ -2086,7 +1984,7 @@ cl_int ValidateEnqueueUnmapMemObject(cl_command_queue command_queue, ...@@ -2086,7 +1984,7 @@ cl_int ValidateEnqueueUnmapMemObject(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
...@@ -2120,7 +2018,7 @@ cl_int ValidateEnqueueNDRangeKernel(cl_command_queue command_queue, ...@@ -2120,7 +2018,7 @@ cl_int ValidateEnqueueNDRangeKernel(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
const Device &device = queue.getDevice(); const Device &device = queue.getDevice();
...@@ -2209,7 +2107,7 @@ cl_int ValidateEnqueueNativeKernel(cl_command_queue command_queue, ...@@ -2209,7 +2107,7 @@ cl_int ValidateEnqueueNativeKernel(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
...@@ -2460,7 +2358,7 @@ cl_int ValidateEnqueueTask(cl_command_queue command_queue, ...@@ -2460,7 +2358,7 @@ cl_int ValidateEnqueueTask(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
// CL_INVALID_KERNEL if kernel is not a valid kernel object. // CL_INVALID_KERNEL if kernel is not a valid kernel object.
...@@ -2651,7 +2549,7 @@ cl_int ValidateEnqueueReadBufferRect(cl_command_queue command_queue, ...@@ -2651,7 +2549,7 @@ cl_int ValidateEnqueueReadBufferRect(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 1u)) if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 1u))
...@@ -2659,10 +2557,10 @@ cl_int ValidateEnqueueReadBufferRect(cl_command_queue command_queue, ...@@ -2659,10 +2557,10 @@ cl_int ValidateEnqueueReadBufferRect(cl_command_queue command_queue,
return CL_INVALID_COMMAND_QUEUE; return CL_INVALID_COMMAND_QUEUE;
} }
ANGLE_TRY(ValidateEnqueueBuffer(queue, buffer, true, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, buffer, true, false));
ANGLE_TRY(ValidateBufferRect(buffer->cast<Buffer>(), buffer_origin, region, buffer_row_pitch, ANGLE_CL_TRY(ValidateBufferRect(buffer->cast<Buffer>(), buffer_origin, region, buffer_row_pitch,
buffer_slice_pitch)); buffer_slice_pitch));
ANGLE_TRY(ValidateHostRect(host_origin, region, host_row_pitch, host_slice_pitch, ptr)); ANGLE_CL_TRY(ValidateHostRect(host_origin, region, host_row_pitch, host_slice_pitch, ptr));
return CL_SUCCESS; return CL_SUCCESS;
} }
...@@ -2682,7 +2580,7 @@ cl_int ValidateEnqueueWriteBufferRect(cl_command_queue command_queue, ...@@ -2682,7 +2580,7 @@ cl_int ValidateEnqueueWriteBufferRect(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 1u)) if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 1u))
...@@ -2690,10 +2588,10 @@ cl_int ValidateEnqueueWriteBufferRect(cl_command_queue command_queue, ...@@ -2690,10 +2588,10 @@ cl_int ValidateEnqueueWriteBufferRect(cl_command_queue command_queue,
return CL_INVALID_COMMAND_QUEUE; return CL_INVALID_COMMAND_QUEUE;
} }
ANGLE_TRY(ValidateEnqueueBuffer(queue, buffer, false, true)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, buffer, false, true));
ANGLE_TRY(ValidateBufferRect(buffer->cast<Buffer>(), buffer_origin, region, buffer_row_pitch, ANGLE_CL_TRY(ValidateBufferRect(buffer->cast<Buffer>(), buffer_origin, region, buffer_row_pitch,
buffer_slice_pitch)); buffer_slice_pitch));
ANGLE_TRY(ValidateHostRect(host_origin, region, host_row_pitch, host_slice_pitch, ptr)); ANGLE_CL_TRY(ValidateHostRect(host_origin, region, host_row_pitch, host_slice_pitch, ptr));
return CL_SUCCESS; return CL_SUCCESS;
} }
...@@ -2712,7 +2610,7 @@ cl_int ValidateEnqueueCopyBufferRect(cl_command_queue command_queue, ...@@ -2712,7 +2610,7 @@ cl_int ValidateEnqueueCopyBufferRect(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 1u)) if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 1u))
...@@ -2720,14 +2618,14 @@ cl_int ValidateEnqueueCopyBufferRect(cl_command_queue command_queue, ...@@ -2720,14 +2618,14 @@ cl_int ValidateEnqueueCopyBufferRect(cl_command_queue command_queue,
return CL_INVALID_COMMAND_QUEUE; return CL_INVALID_COMMAND_QUEUE;
} }
ANGLE_TRY(ValidateEnqueueBuffer(queue, src_buffer, false, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, src_buffer, false, false));
const Buffer &src = src_buffer->cast<Buffer>(); const Buffer &src = src_buffer->cast<Buffer>();
ANGLE_TRY(ValidateEnqueueBuffer(queue, dst_buffer, false, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, dst_buffer, false, false));
const Buffer &dst = dst_buffer->cast<Buffer>(); const Buffer &dst = dst_buffer->cast<Buffer>();
ANGLE_TRY(ValidateBufferRect(src, src_origin, region, src_row_pitch, src_slice_pitch)); ANGLE_CL_TRY(ValidateBufferRect(src, src_origin, region, src_row_pitch, src_slice_pitch));
ANGLE_TRY(ValidateBufferRect(dst, dst_origin, region, dst_row_pitch, dst_slice_pitch)); ANGLE_CL_TRY(ValidateBufferRect(dst, dst_origin, region, dst_row_pitch, dst_slice_pitch));
// CL_INVALID_VALUE if src_buffer and dst_buffer are the same buffer object and src_slice_pitch // CL_INVALID_VALUE if src_buffer and dst_buffer are the same buffer object and src_slice_pitch
// is not equal to dst_slice_pitch or src_row_pitch is not equal to dst_row_pitch. // is not equal to dst_slice_pitch or src_row_pitch is not equal to dst_row_pitch.
...@@ -2811,7 +2709,7 @@ cl_int ValidateCreateImage(cl_context context, ...@@ -2811,7 +2709,7 @@ cl_int ValidateCreateImage(cl_context context,
// CL_INVALID_IMAGE_FORMAT_DESCRIPTOR if values specified in image_format are not valid // CL_INVALID_IMAGE_FORMAT_DESCRIPTOR if values specified in image_format are not valid
// or if image_format is NULL. // or if image_format is NULL.
if (!ValidateImageFormat(image_format, ctx.getPlatform())) if (!IsValidImageFormat(image_format, ctx.getPlatform().getInfo()))
{ {
return CL_INVALID_IMAGE_FORMAT_DESCRIPTOR; return CL_INVALID_IMAGE_FORMAT_DESCRIPTOR;
} }
...@@ -3196,7 +3094,7 @@ cl_int ValidateEnqueueFillBuffer(cl_command_queue command_queue, ...@@ -3196,7 +3094,7 @@ cl_int ValidateEnqueueFillBuffer(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 2u)) if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 2u))
...@@ -3204,7 +3102,7 @@ cl_int ValidateEnqueueFillBuffer(cl_command_queue command_queue, ...@@ -3204,7 +3102,7 @@ cl_int ValidateEnqueueFillBuffer(cl_command_queue command_queue,
return CL_INVALID_COMMAND_QUEUE; return CL_INVALID_COMMAND_QUEUE;
} }
ANGLE_TRY(ValidateEnqueueBuffer(queue, buffer, false, false)); ANGLE_CL_TRY(ValidateEnqueueBuffer(queue, buffer, false, false));
// CL_INVALID_VALUE if offset or offset + size require accessing // CL_INVALID_VALUE if offset or offset + size require accessing
// elements outside the buffer object respectively. // elements outside the buffer object respectively.
...@@ -3239,7 +3137,7 @@ cl_int ValidateEnqueueFillImage(cl_command_queue command_queue, ...@@ -3239,7 +3137,7 @@ cl_int ValidateEnqueueFillImage(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, true, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 2u)) if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 2u))
...@@ -3247,10 +3145,10 @@ cl_int ValidateEnqueueFillImage(cl_command_queue command_queue, ...@@ -3247,10 +3145,10 @@ cl_int ValidateEnqueueFillImage(cl_command_queue command_queue,
return CL_INVALID_COMMAND_QUEUE; return CL_INVALID_COMMAND_QUEUE;
} }
ANGLE_TRY(ValidateEnqueueImage(queue, image, false, false)); ANGLE_CL_TRY(ValidateEnqueueImage(queue, image, false, false));
const Image &img = image->cast<Image>(); const Image &img = image->cast<Image>();
ANGLE_TRY(ValidateImageForDevice(img, queue.getDevice(), origin, region)); ANGLE_CL_TRY(ValidateImageForDevice(img, queue.getDevice(), origin, region));
// CL_INVALID_VALUE if fill_color is NULL. // CL_INVALID_VALUE if fill_color is NULL.
if (fill_color == nullptr) if (fill_color == nullptr)
...@@ -3269,7 +3167,7 @@ cl_int ValidateEnqueueMigrateMemObjects(cl_command_queue command_queue, ...@@ -3269,7 +3167,7 @@ cl_int ValidateEnqueueMigrateMemObjects(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
const CommandQueue &queue = command_queue->cast<CommandQueue>(); const CommandQueue &queue = command_queue->cast<CommandQueue>();
if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 2u)) if (!queue.getContext().getPlatform().isVersionOrNewer(1u, 2u))
...@@ -3316,7 +3214,7 @@ cl_int ValidateEnqueueMarkerWithWaitList(cl_command_queue command_queue, ...@@ -3316,7 +3214,7 @@ cl_int ValidateEnqueueMarkerWithWaitList(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
if (!command_queue->cast<CommandQueue>().getContext().getPlatform().isVersionOrNewer(1u, 2u)) if (!command_queue->cast<CommandQueue>().getContext().getPlatform().isVersionOrNewer(1u, 2u))
{ {
...@@ -3330,7 +3228,7 @@ cl_int ValidateEnqueueBarrierWithWaitList(cl_command_queue command_queue, ...@@ -3330,7 +3228,7 @@ cl_int ValidateEnqueueBarrierWithWaitList(cl_command_queue command_queue,
const cl_event *event_wait_list, const cl_event *event_wait_list,
const cl_event *event) const cl_event *event)
{ {
ANGLE_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list, ANGLE_CL_TRY(ValidateCommandQueueAndEventWaitList(command_queue, false, num_events_in_wait_list,
event_wait_list)); event_wait_list));
if (!command_queue->cast<CommandQueue>().getContext().getPlatform().isVersionOrNewer(1u, 2u)) if (!command_queue->cast<CommandQueue>().getContext().getPlatform().isVersionOrNewer(1u, 2u))
{ {
...@@ -3688,7 +3586,7 @@ cl_int ValidateCreateBufferWithProperties(cl_context context, ...@@ -3688,7 +3586,7 @@ cl_int ValidateCreateBufferWithProperties(cl_context context,
size_t size, size_t size,
const void *host_ptr) const void *host_ptr)
{ {
ANGLE_TRY(ValidateCreateBuffer(context, flags, size, host_ptr)); ANGLE_CL_TRY(ValidateCreateBuffer(context, flags, size, host_ptr));
// CL_INVALID_CONTEXT if context is not a valid context. // CL_INVALID_CONTEXT if context is not a valid context.
if (!context->cast<Context>().getPlatform().isVersionOrNewer(3u, 0u)) if (!context->cast<Context>().getPlatform().isVersionOrNewer(3u, 0u))
...@@ -3714,7 +3612,7 @@ cl_int ValidateCreateImageWithProperties(cl_context context, ...@@ -3714,7 +3612,7 @@ cl_int ValidateCreateImageWithProperties(cl_context context,
const cl_image_desc *image_desc, const cl_image_desc *image_desc,
const void *host_ptr) const void *host_ptr)
{ {
ANGLE_TRY(ValidateCreateImage(context, flags, image_format, image_desc, host_ptr)); ANGLE_CL_TRY(ValidateCreateImage(context, flags, image_format, image_desc, host_ptr));
// CL_INVALID_CONTEXT if context is not a valid context. // CL_INVALID_CONTEXT if context is not a valid context.
if (!context->cast<Context>().getPlatform().isVersionOrNewer(3u, 0u)) if (!context->cast<Context>().getPlatform().isVersionOrNewer(3u, 0u))
......
src/libGLESv2/entry_points_cl_utils.h
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "common/PackedCLEnums_autogen.h" #include "common/PackedCLEnums_autogen.h"
#include <cinttypes>
#include <cstdio> #include <cstdio>
#if defined(ANGLE_ENABLE_DEBUG_TRACE) #if defined(ANGLE_ENABLE_DEBUG_TRACE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment