Used ratified Khronos extension names

Change-Id: I15b62b6f5fb805efedec5cd9e14215a94d97c8f6
This commit is contained in:
Jacek Danecki
2018-02-13 11:41:32 +01:00
parent 82a2afb611
commit ff44e9922d
6 changed files with 20 additions and 12 deletions

View File

@@ -2760,10 +2760,10 @@ clSetPerformanceConfigurationINTEL(
return perfCounters->sendPerfConfiguration(count, offsets, values);
}
cl_command_queue CL_API_CALL clCreateCommandQueueWithPropertiesINTEL(cl_context context,
cl_device_id device,
const cl_queue_properties_intel *properties,
cl_int *errcodeRet) {
cl_command_queue CL_API_CALL clCreateCommandQueueWithPropertiesKHR(cl_context context,
cl_device_id device,
const cl_queue_properties_khr *properties,
cl_int *errcodeRet) {
return clCreateCommandQueueWithProperties(context, device, properties, errcodeRet);
}
@@ -2938,7 +2938,7 @@ void *CL_API_CALL clGetExtensionFunctionAddress(const char *func_name) {
// SPIR-V support through the cl_khr_il_program extension
RETURN_FUNC_PTR_IF_EXIST(clCreateProgramWithILKHR);
RETURN_FUNC_PTR_IF_EXIST(clCreateCommandQueueWithPropertiesINTEL);
RETURN_FUNC_PTR_IF_EXIST(clCreateCommandQueueWithPropertiesKHR);
return nullptr;
}

View File

@@ -838,10 +838,10 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(
const cl_queue_properties *properties,
cl_int *errcodeRet);
cl_command_queue CL_API_CALL clCreateCommandQueueWithPropertiesINTEL(
cl_command_queue CL_API_CALL clCreateCommandQueueWithPropertiesKHR(
cl_context context,
cl_device_id device,
const cl_queue_properties_intel *properties,
const cl_queue_properties_khr *properties,
cl_int *errcodeRet);
cl_sampler CL_API_CALL clCreateSamplerWithProperties(

View File

@@ -59,7 +59,7 @@ typedef void *ID3D11Texture3D;
typedef void *HANDLE;
#endif
typedef cl_bitfield cl_queue_properties_intel;
typedef cl_bitfield cl_queue_properties_khr;
typedef void(CL_CALLBACK *ctxt_logging_fn)(const char *, const void *, size_t, void *);
typedef void(CL_CALLBACK *prog_logging_fn)(cl_program, void *);
typedef void(CL_CALLBACK *evnt_logging_fn)(cl_event, cl_int, void *);
@@ -1277,7 +1277,7 @@ struct SCRTDispatchTable {
void *placeholder12;
void *placeholder13;
// VAMedia sharing extension
// VAMedia sharing extension
#ifdef LIBVA
INTELpfn_clCreateFromVA_APIMediaSurfaceINTEL clCreateFromVA_APIMediaSurfaceINTEL;
INTELpfn_clGetDeviceIDsFromVA_APIMediaAdapterINTEL clGetDeviceIDsFromVA_APIMediaAdapterINTEL;

View File

@@ -45,7 +45,8 @@ const char *deviceExtensionsList = "cl_khr_3d_image_writes "
"cl_intel_driver_diagnostics "
"cl_intel_device_side_avc_motion_estimation "
"cl_khr_priority_hints "
"cl_khr_throttle_hints ";
"cl_khr_throttle_hints "
"cl_khr_create_command_queue ";
std::string getExtensionsList(const HardwareInfo &hwInfo) {
std::string allExtensionsList;

View File

@@ -193,9 +193,9 @@ TEST_F(clCreateCommandQueueWithPropertiesApi, negativeCase) {
EXPECT_NE(retVal, CL_SUCCESS);
}
TEST_F(clCreateCommandQueueWithPropertiesApi, negativeCaseINTEL) {
TEST_F(clCreateCommandQueueWithPropertiesApi, negativeCaseKHR) {
cl_int retVal = CL_SUCCESS;
auto cmdQ = clCreateCommandQueueWithPropertiesINTEL(
auto cmdQ = clCreateCommandQueueWithPropertiesKHR(
nullptr,
nullptr,
0,

View File

@@ -512,6 +512,13 @@ TEST(Device_GetCaps, deviceReportsPriorityHintsExtension) {
EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_khr_priority_hints")));
}
TEST(Device_GetCaps, deviceReportsCreateCommandQueueExtension) {
auto device = std::unique_ptr<Device>(DeviceHelper<>::create(platformDevices[0]));
const auto &caps = device->getDeviceInfo();
EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_khr_create_command_queue")));
}
TEST(Device_GetCaps, deviceReportsThrottleHintsExtension) {
auto device = std::unique_ptr<Device>(DeviceHelper<>::create(platformDevices[0]));
const auto &caps = device->getDeviceInfo();