ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-26 08:49:02 +00:00
Code Packages Projects Releases Wiki Activity

Migrate extensions suites to the new test registration framework (#2334)

Browse Source 
This covers:
* cl_ext_cxx_for_opencl
* cl_khr_command_buffer
* cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch
* cl_khr_dx9_media_sharing
* cl_khr_external_semaphore
* cl_khr_kernel_clock
* cl_khr_semaphore

Contributes to #2181.

---------

Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
This commit is contained in:
Ahmed Hesham
2025-04-16 11:14:34 +01:00
committed by GitHub
parent 33846e6673
commit 90524879e4
72 changed files with 754 additions and 2277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test_conformance/extensions/cl_khr_dx9_media_sharing/main.cpp
View File

@@ -21,16 +21,6 @@
#include "procs.h"
test_definition test_list[] = { ADD_TEST(context_create),
ADD_TEST(get_device_ids),
ADD_TEST(api),
ADD_TEST(kernel),
ADD_TEST(other_data_types),
ADD_TEST(memory_access),
ADD_TEST(interop_user_sync) };
const int test_num = ARRAY_SIZE(test_list);
clGetDeviceIDsFromDX9MediaAdapterKHR_fn clGetDeviceIDsFromDX9MediaAdapterKHR =
NULL;
clCreateFromDX9MediaSurfaceKHR_fn clCreateFromDX9MediaSurfaceKHR = NULL;
@@ -227,5 +217,6 @@ int main(int argc, const char *argv[])
if (!MediaSurfaceSharingExtensionInit()) return TEST_FAIL;
return runTestHarness(argc, argv, test_num, test_list, true, 0);
return runTestHarness(argc, argv, test_registry::getInstance().num_tests(),
test_registry::getInstance().definitions(), true, 0);
}

38
test_conformance/extensions/cl_khr_dx9_media_sharing/procs.h
View File

@@ -1,38 +0,0 @@
//
// Copyright (c) 2019 The Khronos Group Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#ifndef __MEDIA_SHARING_PROCS_H__
#define __MEDIA_SHARING_PROCS_H__
extern int test_context_create(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_get_device_ids(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_api(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_kernel(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_other_data_types(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_memory_access(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_interop_user_sync(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
#endif // #ifndef __MEDIA_SHARING_PROCS_H__

7
test_conformance/extensions/cl_khr_dx9_media_sharing/test_create_context.cpp
View File

@@ -292,8 +292,7 @@ int context_create(cl_device_id deviceID, cl_context context,
return result.Result();
}
int test_context_create(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements)
REGISTER_TEST(context_create)
{
const unsigned int WIDTH = 256;
const unsigned int HEIGHT = 256;
@@ -341,8 +340,8 @@ int test_context_create(cl_device_id deviceID, cl_context context,
continue;
if (context_create(
deviceID, context, queue, num_elements, WIDTH,
HEIGHT, contextFuncs[contextFuncIdx],
device, context, queue, num_elements, WIDTH, HEIGHT,
contextFuncs[contextFuncIdx],
adapterTypes[adapterTypeIdx], formats[formatIdx],
sharedHandleTypes[sharedHandleIdx])
!= 0)

23
test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_api.cpp
View File

@@ -674,14 +674,13 @@ int api_functions(cl_device_id deviceID, cl_context context,
return result.Result();
}
int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
int num_elements)
REGISTER_TEST(api)
{
CResult result;
#if defined(_WIN32)
// D3D9
if (api_functions(deviceID, context, queue, num_elements, 10, 256, 256,
if (api_functions(device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -690,7 +689,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
result.ResultSub(CResult::TEST_FAIL);
}
if (api_functions(deviceID, context, queue, num_elements, 3, 512, 256,
if (api_functions(device, context, queue, num_elements, 3, 512, 256,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -700,7 +699,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
}
// D3D9EX
if (api_functions(deviceID, context, queue, num_elements, 5, 256, 512,
if (api_functions(device, context, queue, num_elements, 5, 256, 512,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -709,7 +708,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
result.ResultSub(CResult::TEST_FAIL);
}
if (api_functions(deviceID, context, queue, num_elements, 7, 512, 256,
if (api_functions(device, context, queue, num_elements, 7, 512, 256,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -718,7 +717,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
result.ResultSub(CResult::TEST_FAIL);
}
if (api_functions(deviceID, context, queue, num_elements, 10, 256, 256,
if (api_functions(device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -727,7 +726,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
result.ResultSub(CResult::TEST_FAIL);
}
if (api_functions(deviceID, context, queue, num_elements, 15, 128, 128,
if (api_functions(device, context, queue, num_elements, 15, 128, 128,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -737,7 +736,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
}
// DXVA
if (api_functions(deviceID, context, queue, num_elements, 20, 128, 128,
if (api_functions(device, context, queue, num_elements, 20, 128, 128,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -746,7 +745,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
result.ResultSub(CResult::TEST_FAIL);
}
if (api_functions(deviceID, context, queue, num_elements, 40, 64, 64,
if (api_functions(device, context, queue, num_elements, 40, 64, 64,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -755,7 +754,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
result.ResultSub(CResult::TEST_FAIL);
}
if (api_functions(deviceID, context, queue, num_elements, 5, 512, 512,
if (api_functions(device, context, queue, num_elements, 5, 512, 512,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -764,7 +763,7 @@ int test_api(cl_device_id deviceID, cl_context context, cl_command_queue queue,
result.ResultSub(CResult::TEST_FAIL);
}
if (api_functions(deviceID, context, queue, num_elements, 2, 1024, 1024,
if (api_functions(device, context, queue, num_elements, 2, 1024, 1024,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_ENABLED)
!= 0)

23
test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_kernel.cpp
View File

@@ -434,14 +434,13 @@ int kernel_functions(cl_device_id deviceID, cl_context context,
return result.Result();
}
int test_kernel(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements)
REGISTER_TEST(kernel)
{
CResult result;
#if defined(_WIN32)
// D3D9
if (kernel_functions(deviceID, context, queue, num_elements, 10, 256, 256,
if (kernel_functions(device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -450,7 +449,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (kernel_functions(deviceID, context, queue, num_elements, 3, 256, 256,
if (kernel_functions(device, context, queue, num_elements, 3, 256, 256,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -460,7 +459,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
}
// D3D9EX
if (kernel_functions(deviceID, context, queue, num_elements, 5, 256, 512,
if (kernel_functions(device, context, queue, num_elements, 5, 256, 512,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -469,7 +468,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (kernel_functions(deviceID, context, queue, num_elements, 7, 512, 256,
if (kernel_functions(device, context, queue, num_elements, 7, 512, 256,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -478,7 +477,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (kernel_functions(deviceID, context, queue, num_elements, 10, 256, 256,
if (kernel_functions(device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -487,7 +486,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (kernel_functions(deviceID, context, queue, num_elements, 15, 128, 128,
if (kernel_functions(device, context, queue, num_elements, 15, 128, 128,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -497,7 +496,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
}
// DXVA
if (kernel_functions(deviceID, context, queue, num_elements, 20, 128, 128,
if (kernel_functions(device, context, queue, num_elements, 20, 128, 128,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -506,7 +505,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (kernel_functions(deviceID, context, queue, num_elements, 40, 64, 64,
if (kernel_functions(device, context, queue, num_elements, 40, 64, 64,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -515,7 +514,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (kernel_functions(deviceID, context, queue, num_elements, 5, 512, 512,
if (kernel_functions(device, context, queue, num_elements, 5, 512, 512,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -524,7 +523,7 @@ int test_kernel(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (kernel_functions(deviceID, context, queue, num_elements, 2, 1024, 1024,
if (kernel_functions(device, context, queue, num_elements, 2, 1024, 1024,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_ENABLED)
!= 0)

9
test_conformance/extensions/cl_khr_dx9_media_sharing/test_get_device_ids.cpp
View File

@@ -182,13 +182,12 @@ int get_device_ids(cl_device_id deviceID, cl_context context,
return result.Result();
}
int test_get_device_ids(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements)
REGISTER_TEST(get_device_ids)
{
CResult result;
#if defined(_WIN32)
if (get_device_ids(deviceID, context, queue, num_elements,
if (get_device_ids(device, context, queue, num_elements,
CL_ADAPTER_D3D9_KHR)
!= 0)
{
@@ -196,7 +195,7 @@ int test_get_device_ids(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (get_device_ids(deviceID, context, queue, num_elements,
if (get_device_ids(device, context, queue, num_elements,
CL_ADAPTER_D3D9EX_KHR)
!= 0)
{
@@ -204,7 +203,7 @@ int test_get_device_ids(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (get_device_ids(deviceID, context, queue, num_elements,
if (get_device_ids(device, context, queue, num_elements,
CL_ADAPTER_DXVA_KHR)
!= 0)
{

5
test_conformance/extensions/cl_khr_dx9_media_sharing/test_interop_sync.cpp
View File

@@ -327,8 +327,7 @@ int interop_user_sync(cl_device_id deviceID, cl_context context,
return result.Result();
}
int test_interop_user_sync(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements)
REGISTER_TEST(interop_user_sync)
{
const unsigned int WIDTH = 256;
const unsigned int HEIGHT = 256;
@@ -382,7 +381,7 @@ int test_interop_user_sync(cl_device_id deviceID, cl_context context,
continue;
if (interop_user_sync(
deviceID, context, queue, num_elements, WIDTH,
device, context, queue, num_elements, WIDTH,
HEIGHT, contextFuncs[contextFuncIdx],
adapters[adapterIdx], formats[formatIdx],
sharedHandleTypes[sharedHandleIdx],

23
test_conformance/extensions/cl_khr_dx9_media_sharing/test_memory_access.cpp
View File

@@ -442,14 +442,13 @@ int memory_access(cl_device_id deviceID, cl_context context,
return result.Result();
}
int test_memory_access(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements)
REGISTER_TEST(memory_access)
{
CResult result;
#if defined(_WIN32)
// D3D9
if (memory_access(deviceID, context, queue, num_elements, 256, 256,
if (memory_access(device, context, queue, num_elements, 256, 256,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -458,7 +457,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (memory_access(deviceID, context, queue, num_elements, 512, 256,
if (memory_access(device, context, queue, num_elements, 512, 256,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -468,7 +467,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
}
// D3D9EX
if (memory_access(deviceID, context, queue, num_elements, 256, 512,
if (memory_access(device, context, queue, num_elements, 256, 512,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -477,7 +476,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (memory_access(deviceID, context, queue, num_elements, 512, 256,
if (memory_access(device, context, queue, num_elements, 512, 256,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -486,7 +485,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (memory_access(deviceID, context, queue, num_elements, 256, 256,
if (memory_access(device, context, queue, num_elements, 256, 256,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -495,7 +494,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (memory_access(deviceID, context, queue, num_elements, 128, 128,
if (memory_access(device, context, queue, num_elements, 128, 128,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -505,7 +504,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
}
// DXVA
if (memory_access(deviceID, context, queue, num_elements, 128, 128,
if (memory_access(device, context, queue, num_elements, 128, 128,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -514,7 +513,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (memory_access(deviceID, context, queue, num_elements, 64, 64,
if (memory_access(device, context, queue, num_elements, 64, 64,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_NV12,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -523,7 +522,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (memory_access(deviceID, context, queue, num_elements, 512, 512,
if (memory_access(device, context, queue, num_elements, 512, 512,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -532,7 +531,7 @@ int test_memory_access(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (memory_access(deviceID, context, queue, num_elements, 1024, 1024,
if (memory_access(device, context, queue, num_elements, 1024, 1024,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_YV12,
SHARED_HANDLE_ENABLED)
!= 0)

217
test_conformance/extensions/cl_khr_dx9_media_sharing/test_other_data_types.cpp
View File

@@ -527,15 +527,14 @@ int other_data_types(cl_device_id deviceID, cl_context context,
return result.Result();
}
int test_other_data_types(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements)
REGISTER_TEST(other_data_types)
{
CResult result;
#if defined(_WIN32)
// D3D9
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
64, 256, CL_ADAPTER_D3D9_KHR,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10, 64,
256, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_R32F, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -543,16 +542,16 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
256, 128, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_R16F, SHARED_HANDLE_DISABLED)
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 256,
128, CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_R16F,
SHARED_HANDLE_DISABLED)
!= 0)
{
log_error("\nTest case (D3D9, R16F, no shared handle) failed\n\n");
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
512, 256, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_L16, SHARED_HANDLE_DISABLED)
!= 0)
@@ -561,7 +560,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 512, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_A8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -570,7 +569,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
1024, 32, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_L8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -580,7 +579,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_float>(
deviceID, context, queue, num_elements, 10, 32, 1024,
device, context, queue, num_elements, 10, 32, 1024,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_G32R32F, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -589,7 +588,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_half>(
deviceID, context, queue, num_elements, 10, 64, 64,
device, context, queue, num_elements, 10, 64, 64,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_G16R16F, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -598,7 +597,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_ushort>(
deviceID, context, queue, num_elements, 10, 256, 256,
device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_D3D9_KHR, SURFACE_FORMAT_G16R16, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -606,7 +605,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 128, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_A8L8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -615,7 +614,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10,
128, 512, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_A32B32G32R32F,
SHARED_HANDLE_DISABLED)
@@ -626,8 +625,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
128, 128, CL_ADAPTER_D3D9_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 128,
128, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_A16B16G16R16F,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -637,7 +636,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
64, 128, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_A16B16G16R16,
SHARED_HANDLE_DISABLED)
@@ -648,7 +647,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
128, 64, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_A8B8G8R8,
SHARED_HANDLE_DISABLED)
@@ -658,8 +657,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
16, 512, CL_ADAPTER_D3D9_KHR,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10, 16,
512, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_X8B8G8R8,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -668,7 +667,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 16, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_A8R8G8B8,
SHARED_HANDLE_DISABLED)
@@ -678,7 +677,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 256, CL_ADAPTER_D3D9_KHR,
SURFACE_FORMAT_X8R8G8B8,
SHARED_HANDLE_DISABLED)
@@ -690,8 +689,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
// D3D9EX
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
64, 256, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10, 64,
256, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_R32F, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -699,8 +698,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
64, 256, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10, 64,
256, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_R32F, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -708,8 +707,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
256, 128, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 256,
128, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_R16F, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -717,8 +716,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
256, 128, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 256,
128, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_R16F, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -726,7 +725,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
512, 256, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_L16, SHARED_HANDLE_DISABLED)
!= 0)
@@ -735,7 +734,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
512, 256, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_L16, SHARED_HANDLE_ENABLED)
!= 0)
@@ -744,7 +743,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 512, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -753,7 +752,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 512, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A8, SHARED_HANDLE_ENABLED)
!= 0)
@@ -762,7 +761,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
1024, 32, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_L8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -771,7 +770,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
1024, 32, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_L8, SHARED_HANDLE_ENABLED)
!= 0)
@@ -780,8 +779,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
32, 1024, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10, 32,
1024, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_G32R32F,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -790,8 +789,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
32, 1024, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10, 32,
1024, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_G32R32F,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -800,8 +799,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
64, 64, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 64,
64, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_G16R16F,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -810,8 +809,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
64, 64, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 64,
64, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_G16R16F, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -819,7 +818,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
256, 256, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_G16R16,
SHARED_HANDLE_DISABLED)
@@ -830,7 +829,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_ushort>(
deviceID, context, queue, num_elements, 10, 256, 256,
device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_D3D9EX_KHR, SURFACE_FORMAT_G16R16, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -838,7 +837,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 128, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A8L8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -847,7 +846,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 128, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A8L8, SHARED_HANDLE_ENABLED)
!= 0)
@@ -856,7 +855,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10,
128, 512, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A32B32G32R32F,
SHARED_HANDLE_DISABLED)
@@ -867,7 +866,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10,
128, 512, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A32B32G32R32F,
SHARED_HANDLE_ENABLED)
@@ -878,8 +877,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
128, 128, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 128,
128, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A16B16G16R16F,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -889,8 +888,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
128, 128, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 128,
128, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A16B16G16R16F,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -900,7 +899,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
64, 128, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A16B16G16R16,
SHARED_HANDLE_DISABLED)
@@ -911,7 +910,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
64, 128, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A16B16G16R16,
SHARED_HANDLE_ENABLED)
@@ -922,7 +921,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
128, 64, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A8B8G8R8,
SHARED_HANDLE_DISABLED)
@@ -933,7 +932,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
128, 64, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A8B8G8R8,
SHARED_HANDLE_ENABLED)
@@ -943,8 +942,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
16, 512, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10, 16,
512, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_X8B8G8R8,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -954,8 +953,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
16, 512, CL_ADAPTER_D3D9EX_KHR,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10, 16,
512, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_X8B8G8R8,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -964,7 +963,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 16, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A8R8G8B8,
SHARED_HANDLE_DISABLED)
@@ -975,7 +974,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 16, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_A8R8G8B8,
SHARED_HANDLE_ENABLED)
@@ -985,7 +984,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 256, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_X8R8G8B8,
SHARED_HANDLE_DISABLED)
@@ -996,7 +995,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 256, CL_ADAPTER_D3D9EX_KHR,
SURFACE_FORMAT_X8R8G8B8,
SHARED_HANDLE_ENABLED)
@@ -1008,8 +1007,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
// DXVA
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
64, 256, CL_ADAPTER_DXVA_KHR,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10, 64,
256, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_R32F, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -1017,8 +1016,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
64, 256, CL_ADAPTER_DXVA_KHR,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10, 64,
256, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_R32F, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -1026,25 +1025,25 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
256, 128, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_R16F, SHARED_HANDLE_DISABLED)
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 256,
128, CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_R16F,
SHARED_HANDLE_DISABLED)
!= 0)
{
log_error("\nTest case (DXVA, R16F, no shared handle) failed\n\n");
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
256, 128, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_R16F, SHARED_HANDLE_ENABLED)
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 256,
128, CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_R16F,
SHARED_HANDLE_ENABLED)
!= 0)
{
log_error("\nTest case (DXVA, R16F, shared handle) failed\n\n");
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
512, 256, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_L16, SHARED_HANDLE_DISABLED)
!= 0)
@@ -1053,7 +1052,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
512, 256, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_L16, SHARED_HANDLE_ENABLED)
!= 0)
@@ -1062,7 +1061,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 512, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -1071,7 +1070,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 512, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A8, SHARED_HANDLE_ENABLED)
!= 0)
@@ -1080,7 +1079,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
1024, 32, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_L8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -1089,7 +1088,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
1024, 32, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_L8, SHARED_HANDLE_ENABLED)
!= 0)
@@ -1099,7 +1098,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_float>(
deviceID, context, queue, num_elements, 10, 32, 1024,
device, context, queue, num_elements, 10, 32, 1024,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_G32R32F, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -1108,7 +1107,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_float>(
deviceID, context, queue, num_elements, 10, 32, 1024,
device, context, queue, num_elements, 10, 32, 1024,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_G32R32F, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -1117,7 +1116,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_half>(
deviceID, context, queue, num_elements, 10, 64, 64,
device, context, queue, num_elements, 10, 64, 64,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_G16R16F, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -1125,8 +1124,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
64, 64, CL_ADAPTER_DXVA_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 64,
64, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_G16R16F, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -1135,7 +1134,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_ushort>(
deviceID, context, queue, num_elements, 10, 256, 256,
device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_G16R16, SHARED_HANDLE_DISABLED)
!= 0)
{
@@ -1144,7 +1143,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_ushort>(
deviceID, context, queue, num_elements, 10, 256, 256,
device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_G16R16, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -1152,7 +1151,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 128, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A8L8, SHARED_HANDLE_DISABLED)
!= 0)
@@ -1161,7 +1160,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 128, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A8L8, SHARED_HANDLE_ENABLED)
!= 0)
@@ -1170,7 +1169,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10,
128, 512, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A32B32G32R32F,
SHARED_HANDLE_DISABLED)
@@ -1181,7 +1180,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_float>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_float>(device, context, queue, num_elements, 10,
128, 512, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A32B32G32R32F,
SHARED_HANDLE_ENABLED)
@@ -1192,8 +1191,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
128, 128, CL_ADAPTER_DXVA_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 128,
128, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A16B16G16R16F,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -1203,8 +1202,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_half>(deviceID, context, queue, num_elements, 10,
128, 128, CL_ADAPTER_DXVA_KHR,
if (other_data_types<cl_half>(device, context, queue, num_elements, 10, 128,
128, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A16B16G16R16F,
SHARED_HANDLE_ENABLED)
!= 0)
@@ -1214,7 +1213,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
64, 128, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A16B16G16R16,
SHARED_HANDLE_DISABLED)
@@ -1225,7 +1224,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_ushort>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_ushort>(device, context, queue, num_elements, 10,
64, 128, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A16B16G16R16,
SHARED_HANDLE_ENABLED)
@@ -1235,7 +1234,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
128, 64, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A8B8G8R8,
SHARED_HANDLE_DISABLED)
@@ -1246,7 +1245,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_uchar>(
deviceID, context, queue, num_elements, 10, 128, 64,
device, context, queue, num_elements, 10, 128, 64,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_A8B8G8R8, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -1254,8 +1253,8 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
16, 512, CL_ADAPTER_DXVA_KHR,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10, 16,
512, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_X8B8G8R8,
SHARED_HANDLE_DISABLED)
!= 0)
@@ -1265,7 +1264,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_uchar>(
deviceID, context, queue, num_elements, 10, 16, 512,
device, context, queue, num_elements, 10, 16, 512,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_X8B8G8R8, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -1273,7 +1272,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
512, 16, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_A8R8G8B8,
SHARED_HANDLE_DISABLED)
@@ -1284,7 +1283,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_uchar>(
deviceID, context, queue, num_elements, 10, 512, 16,
device, context, queue, num_elements, 10, 512, 16,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_A8R8G8B8, SHARED_HANDLE_ENABLED)
!= 0)
{
@@ -1292,7 +1291,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
result.ResultSub(CResult::TEST_FAIL);
}
if (other_data_types<cl_uchar>(deviceID, context, queue, num_elements, 10,
if (other_data_types<cl_uchar>(device, context, queue, num_elements, 10,
256, 256, CL_ADAPTER_DXVA_KHR,
SURFACE_FORMAT_X8R8G8B8,
SHARED_HANDLE_DISABLED)
@@ -1303,7 +1302,7 @@ int test_other_data_types(cl_device_id deviceID, cl_context context,
}
if (other_data_types<cl_uchar>(
deviceID, context, queue, num_elements, 10, 256, 256,
device, context, queue, num_elements, 10, 256, 256,
CL_ADAPTER_DXVA_KHR, SURFACE_FORMAT_X8R8G8B8, SHARED_HANDLE_ENABLED)
!= 0)
{