From fa4c14fcbe05bb1b8940d57a26b665d9dd01a888 Mon Sep 17 00:00:00 2001 From: paulfradgley <39525348+paulfradgley@users.noreply.github.com> Date: Thu, 16 Feb 2023 07:56:19 +0000 Subject: [PATCH] Fixed CL_MEM_KERNEL_READ_AND_WRITE flag override The mem_flags override for CL_MEM_KERNEL_READ_AND_WRITE was incorrectly affecting subsequent iterations of the image_format loop. Fixed by using a separate variable inside the loop. --- .../test_cl_ext_image_from_buffer.cpp | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/test_conformance/images/kernel_read_write/test_cl_ext_image_from_buffer.cpp b/test_conformance/images/kernel_read_write/test_cl_ext_image_from_buffer.cpp index 9edc361d..0b665f94 100644 --- a/test_conformance/images/kernel_read_write/test_cl_ext_image_from_buffer.cpp +++ b/test_conformance/images/kernel_read_write/test_cl_ext_image_from_buffer.cpp @@ -89,14 +89,14 @@ int image2d_from_buffer_positive(cl_device_id device, cl_context context, CL_MEM_READ_WRITE, CL_MEM_KERNEL_READ_AND_WRITE }; - for (auto flag : flagTypes) + for (auto flagType : flagTypes) { for (auto imageType : imageTypes) { /* Get the list of supported image formats */ std::vector formatList; if (TEST_PASS - != get_format_list(context, imageType, formatList, flag) + != get_format_list(context, imageType, formatList, flagType) || formatList.size() == 0) { test_fail("Failure to get supported formats list\n"); @@ -121,9 +121,9 @@ int image2d_from_buffer_positive(cl_device_id device, cl_context context, cl_image_desc image_desc = { 0 }; image_desc_init(&image_desc, imageType); - flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) + cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE) ? CL_MEM_READ_WRITE - : flag; + : flagType; size_t row_pitch_alignment = 0; size_t base_address_alignment = 0; @@ -187,14 +187,14 @@ int memInfo_image_from_buffer_positive(cl_device_id device, cl_context context, CL_MEM_READ_WRITE, CL_MEM_KERNEL_READ_AND_WRITE }; - for (auto flag : flagTypes) + for (auto flagType : flagTypes) { for (auto imageType : imageTypes) { /* Get the list of supported image formats */ std::vector formatList; if (TEST_PASS - != get_format_list(context, imageType, formatList, flag) + != get_format_list(context, imageType, formatList, flagType) || formatList.size() == 0) { test_fail("Failure to get supported formats list\n"); @@ -205,9 +205,9 @@ int memInfo_image_from_buffer_positive(cl_device_id device, cl_context context, cl_image_desc image_desc = { 0 }; image_desc_init(&image_desc, imageType); - flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) + cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE) ? CL_MEM_READ_WRITE - : flag; + : flagType; size_t row_pitch_alignment = 0; size_t slice_pitch_alignment = 0; @@ -296,14 +296,14 @@ int imageInfo_image_from_buffer_positive(cl_device_id device, CL_MEM_READ_WRITE, CL_MEM_KERNEL_READ_AND_WRITE }; - for (auto flag : flagTypes) + for (auto flagType : flagTypes) { for (auto imageType : imageTypes) { /* Get the list of supported image formats */ std::vector formatList; if (TEST_PASS - != get_format_list(context, imageType, formatList, flag) + != get_format_list(context, imageType, formatList, flagType) || formatList.size() == 0) { test_fail("Failure to get supported formats list\n"); @@ -314,9 +314,9 @@ int imageInfo_image_from_buffer_positive(cl_device_id device, cl_image_desc image_desc = { 0 }; image_desc_init(&image_desc, imageType); - flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) + cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE) ? CL_MEM_READ_WRITE - : flag; + : flagType; size_t row_pitch_alignment = 0; size_t slice_pitch_alignment = 0; @@ -446,14 +446,14 @@ int image_from_buffer_alignment_negative(cl_device_id device, CL_MEM_READ_WRITE, CL_MEM_KERNEL_READ_AND_WRITE }; - for (auto flag : flagTypes) + for (auto flagType : flagTypes) { for (auto imageType : imageTypes) { /* Get the list of supported image formats */ std::vector formatList; if (TEST_PASS - != get_format_list(context, imageType, formatList, flag) + != get_format_list(context, imageType, formatList, flagType) || formatList.size() == 0) { test_fail("Failure to get supported formats list\n"); @@ -464,9 +464,9 @@ int image_from_buffer_alignment_negative(cl_device_id device, cl_image_desc image_desc = { 0 }; image_desc_init(&image_desc, imageType); - flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) + cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE) ? CL_MEM_READ_WRITE - : flag; + : flagType; size_t row_pitch_alignment = 0; size_t slice_pitch_alignment = 0; @@ -596,14 +596,14 @@ int image_from_small_buffer_negative(cl_device_id device, cl_context context, CL_MEM_READ_WRITE, CL_MEM_KERNEL_READ_AND_WRITE }; - for (auto flag : flagTypes) + for (auto flagType : flagTypes) { for (auto imageType : imageTypes) { /* Get the list of supported image formats */ std::vector formatList; if (TEST_PASS - != get_format_list(context, imageType, formatList, flag) + != get_format_list(context, imageType, formatList, flagType) || formatList.size() == 0) { test_fail("Failure to get supported formats list\n"); @@ -614,9 +614,9 @@ int image_from_small_buffer_negative(cl_device_id device, cl_context context, cl_image_desc image_desc = { 0 }; image_desc_init(&image_desc, imageType); - flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) + cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE) ? CL_MEM_READ_WRITE - : flag; + : flagType; /* Invalid buffer size */ cl_int err; @@ -704,14 +704,14 @@ int image_from_buffer_fill_positive(cl_device_id device, cl_context context, CL_MEM_READ_WRITE, CL_MEM_KERNEL_READ_AND_WRITE }; - for (auto flag : flagTypes) + for (auto flagType : flagTypes) { for (auto imageType : imageTypes) { /* Get the list of supported image formats */ std::vector formatList; if (TEST_PASS - != get_format_list(context, imageType, formatList, flag) + != get_format_list(context, imageType, formatList, flagType) || formatList.size() == 0) { test_fail("Failure to get supported formats list\n"); @@ -722,9 +722,9 @@ int image_from_buffer_fill_positive(cl_device_id device, cl_context context, cl_image_desc image_desc = { 0 }; image_desc_init(&image_desc, imageType); - flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) + cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE) ? CL_MEM_READ_WRITE - : flag; + : flagType; size_t row_pitch_alignment = 0; size_t slice_pitch_alignment = 0;