From 350e5fa684d93d6485c83ca0e04bec7b3caa38aa Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 17 Apr 2018 14:21:11 +0200 Subject: [PATCH] Correct error value when setting invalid kernel arg Change-Id: I9719e7ea7b4cf39fae57996528dd56595ee9bfcc --- runtime/kernel/kernel.cpp | 2 +- unit_tests/kernel/kernel_image_arg_tests.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp index f9079b27cd..41a04eaa83 100644 --- a/runtime/kernel/kernel.cpp +++ b/runtime/kernel/kernel.cpp @@ -2062,7 +2062,7 @@ cl_int Kernel::checkCorrectImageAccessQualifier(cl_uint argIndex, return CL_INVALID_ARG_VALUE; } } else { - return CL_INVALID_VALUE; + return CL_INVALID_ARG_VALUE; } } return CL_SUCCESS; diff --git a/unit_tests/kernel/kernel_image_arg_tests.cpp b/unit_tests/kernel/kernel_image_arg_tests.cpp index f6a074af2a..fdaf59ba09 100644 --- a/unit_tests/kernel/kernel_image_arg_tests.cpp +++ b/unit_tests/kernel/kernel_image_arg_tests.cpp @@ -137,7 +137,7 @@ TEST_F(KernelImageArgTest, givenImageWithWriteOnlyAccessAndReadOnlyArgWhenCheckC EXPECT_EQ(retVal, CL_INVALID_ARG_INDEX); } -TEST_F(KernelImageArgTest, givenImageWithReadOnlyAccessAndWriteOnlyArgWhenCheckCorrectImageAccessQualifierIsCalledThenRetValNotValid) { +TEST_F(KernelImageArgTest, givenImageWithReadOnlyAccessAndWriteOnlyArgWhenCheckCorrectImageAccessQualifierIsCalledThenReturnsInvalidArgValue) { cl_image_format imgFormat = {CL_RGBA, CL_UNORM_INT8}; cl_image_desc imgDesc = {}; imgDesc.image_type = CL_MEM_OBJECT_IMAGE2D; @@ -154,7 +154,7 @@ TEST_F(KernelImageArgTest, givenImageWithReadOnlyAccessAndWriteOnlyArgWhenCheckC Image *image = NULL; memObj = image; retVal = pKernel->checkCorrectImageAccessQualifier(0, sizeof(memObj), &memObj); - EXPECT_EQ(retVal, CL_INVALID_VALUE); + EXPECT_EQ(retVal, CL_INVALID_ARG_VALUE); } TEST_F(KernelImageArgTest, givenImageWithReadOnlyAccessAndReadOnlyArgWhenCheckCorrectImageAccessQualifierIsCalledThenRetValNotValid) {