Skip to content

Commit e9e78e8

Browse files
Fix image type support and flag usage in va api sharing
Signed-off-by: Kacper Nowak <[email protected]>
1 parent 68e01dd commit e9e78e8

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

opencl/source/sharings/va/va_sharing_functions.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,13 @@ cl_int VASharingFunctions::getSupportedFormats(cl_mem_flags flags,
9898
cl_uint numEntries,
9999
VAImageFormat *formats,
100100
cl_uint *numImageFormats) {
101-
if (flags != CL_MEM_READ_ONLY && flags != CL_MEM_WRITE_ONLY && flags != CL_MEM_READ_WRITE) {
101+
if (flags != CL_MEM_READ_ONLY && flags != CL_MEM_WRITE_ONLY && flags != CL_MEM_READ_WRITE &&
102+
flags != CL_MEM_KERNEL_READ_AND_WRITE) {
102103
return CL_INVALID_VALUE;
103104
}
104105

105106
if (imageType != CL_MEM_OBJECT_IMAGE2D) {
106-
return CL_INVALID_VALUE;
107+
return CL_SUCCESS;
107108
}
108109

109110
if (numImageFormats != nullptr) {

opencl/test/unit_test/sharings/va/va_sharing_tests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,8 @@ TEST_F(ApiVaSharingTests, givenNullNumImageFormatsWhenGettingSupportedVAApiForma
847847
EXPECT_EQ(CL_SUCCESS, result);
848848
}
849849

850-
TEST_F(ApiVaSharingTests, givenInvalidImageTypeWhenGettingSupportedVAApiFormatsThenIvalidValueErrorIsReturned) {
851-
cl_mem_flags flags = CL_MEM_READ_WRITE;
850+
TEST_F(ApiVaSharingTests, givenOtherThanImage2DImageTypeWhenGettingSupportedVAApiFormatsThenSuccessAndZeroFormatsAreReturned) {
851+
cl_mem_flags flags = CL_MEM_KERNEL_READ_AND_WRITE;
852852
cl_mem_object_type image_type = CL_MEM_OBJECT_IMAGE3D;
853853
VAImageFormat vaApiFormats[10] = {};
854854
cl_uint numImageFormats = 0;
@@ -862,7 +862,7 @@ TEST_F(ApiVaSharingTests, givenInvalidImageTypeWhenGettingSupportedVAApiFormatsT
862862
vaApiFormats,
863863
&numImageFormats);
864864

865-
EXPECT_EQ(CL_INVALID_VALUE, result);
865+
EXPECT_EQ(CL_SUCCESS, result);
866866
EXPECT_EQ(0u, numImageFormats);
867867
}
868868

0 commit comments

Comments
 (0)