Skip to content

Commit 152f89f

Browse files
Revert "Adding CL_INTENSITY,CL_FLOAT format as RW"
This reverts commit ebc5c9b83d617a609d3f552d3662c8f378216dee.
1 parent 5c00ca7 commit 152f89f

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

opencl/source/helpers/surface_formats.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ namespace NEO {
6060
{{CL_RG, CL_SNORM_INT8}, {GMM_FORMAT_R8G8_SNORM_TYPE, GFX3DSTATE_SURFACEFORMAT_R8G8_SNORM , 0, 2, 1, 2}}, \
6161
{{CL_RG, CL_SNORM_INT16}, {GMM_FORMAT_R16G16_SNORM_TYPE, GFX3DSTATE_SURFACEFORMAT_R16G16_SNORM , 0, 2, 2, 4}}, \
6262
{{CL_RGBA, CL_SNORM_INT8}, {GMM_FORMAT_R8G8B8A8_SNORM_TYPE, GFX3DSTATE_SURFACEFORMAT_R8G8B8A8_SNORM , 0, 4, 1, 4}}, \
63-
{{CL_RGBA, CL_SNORM_INT16}, {GMM_FORMAT_R16G16B16A16_SNORM_TYPE, GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_SNORM , 0, 4, 2, 8}}, \
64-
{{CL_INTENSITY, CL_FLOAT}, {GMM_FORMAT_GENERIC_32BIT, GFX3DSTATE_SURFACEFORMAT_I32_FLOAT , 0, 1, 4, 4}}
63+
{{CL_RGBA, CL_SNORM_INT16}, {GMM_FORMAT_R16G16B16A16_SNORM_TYPE, GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_SNORM , 0, 4, 2, 8}}
6564

6665
#define READONLYFORMATS \
6766
{{CL_INTENSITY, CL_UNORM_INT8}, {GMM_FORMAT_GENERIC_8BIT, GFX3DSTATE_SURFACEFORMAT_I8_UNORM , 0, 1, 1, 1}}, \
6867
{{CL_INTENSITY, CL_UNORM_INT16}, {GMM_FORMAT_GENERIC_16BIT, GFX3DSTATE_SURFACEFORMAT_I16_UNORM , 0, 1, 2, 2}}, \
6968
{{CL_INTENSITY, CL_HALF_FLOAT}, {GMM_FORMAT_GENERIC_16BIT, GFX3DSTATE_SURFACEFORMAT_I16_FLOAT , 0, 1, 2, 2}}, \
69+
{{CL_INTENSITY, CL_FLOAT}, {GMM_FORMAT_GENERIC_32BIT, GFX3DSTATE_SURFACEFORMAT_I32_FLOAT , 0, 1, 4, 4}}, \
7070
{{CL_A, CL_UNORM_INT16}, {GMM_FORMAT_GENERIC_16BIT, GFX3DSTATE_SURFACEFORMAT_A16_UNORM , 0, 1, 2, 2}}, \
7171
{{CL_A, CL_HALF_FLOAT}, {GMM_FORMAT_GENERIC_16BIT, GFX3DSTATE_SURFACEFORMAT_A16_FLOAT , 0, 1, 2, 2}}, \
7272
{{CL_A, CL_FLOAT}, {GMM_FORMAT_GENERIC_32BIT, GFX3DSTATE_SURFACEFORMAT_A32_FLOAT , 0, 1, 4, 4}}

opencl/test/unit_test/api/cl_create_image_tests.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -954,26 +954,6 @@ TEST_F(clCreateImage2DTest, GivenValidParametersWhenCreating2DImageThenImageIsCr
954954
EXPECT_EQ(CL_SUCCESS, retVal);
955955
}
956956

957-
TEST_F(clCreateImage2DTest, GivenValidParametersWhenCreating2DImageAndImageFormatIsClIntencityClFloatThenImageIsCreatedAndSuccessReturned) {
958-
REQUIRE_IMAGE_SUPPORT_OR_SKIP(pContext);
959-
cl_image_format imageFormatRW = {CL_INTENSITY, CL_FLOAT};
960-
auto image = clCreateImage2D(
961-
pContext,
962-
CL_MEM_READ_WRITE,
963-
&imageFormatRW,
964-
10,
965-
10,
966-
0,
967-
0,
968-
&retVal);
969-
970-
EXPECT_EQ(CL_SUCCESS, retVal);
971-
EXPECT_NE(nullptr, image);
972-
973-
retVal = clReleaseMemObject(image);
974-
EXPECT_EQ(CL_SUCCESS, retVal);
975-
}
976-
977957
TEST_F(clCreateImage2DTest, GivenNoPtrToReturnValueWhenCreating2DImageThenImageIsCreated) {
978958
REQUIRE_IMAGE_SUPPORT_OR_SKIP(pContext);
979959
auto image = clCreateImage2D(

0 commit comments

Comments
 (0)