From 51d2e5003ed8a2685d55cb9bdad022a5effb8f6e Mon Sep 17 00:00:00 2001 From: Radek Szymanski Date: Fri, 6 Nov 2020 12:24:59 +0100 Subject: [PATCH] Remove unused code in clGetInfo (#1038) These declarations either aren't used or aren't needed, as testBase.h already declares them. Signed-off-by: Radek Szymanski --- test_conformance/images/clGetInfo/main.cpp | 11 +---------- test_conformance/images/clGetInfo/test_1D.cpp | 5 ----- .../images/clGetInfo/test_1D_2D_array.cpp | 5 ----- test_conformance/images/clGetInfo/test_2D.cpp | 6 ------ test_conformance/images/clGetInfo/test_3D.cpp | 5 ----- test_conformance/images/clGetInfo/test_loops.cpp | 12 ------------ 6 files changed, 1 insertion(+), 43 deletions(-) diff --git a/test_conformance/images/clGetInfo/main.cpp b/test_conformance/images/clGetInfo/main.cpp index cea2ad66..10694186 100644 --- a/test_conformance/images/clGetInfo/main.cpp +++ b/test_conformance/images/clGetInfo/main.cpp @@ -13,30 +13,21 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../harness/compat.h" #include #include - -#if !defined(_WIN32) -#include -#include -#endif - #include "../testBase.h" +#include "../harness/compat.h" bool gDebugTrace; bool gTestSmallImages; bool gTestMaxImages; -int gTypesToTest; cl_channel_type gChannelTypeToUse = (cl_channel_type)-1; cl_channel_order gChannelOrderToUse = (cl_channel_order)-1; extern int test_image_set( cl_device_id device, cl_context context, cl_mem_object_type image_type ); static void printUsage( const char *execName ); -#define MAX_ALLOWED_STD_DEVIATION_IN_MB 8.0 - int test_1D(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements) { return test_image_set( device, context, CL_MEM_OBJECT_IMAGE1D ); diff --git a/test_conformance/images/clGetInfo/test_1D.cpp b/test_conformance/images/clGetInfo/test_1D.cpp index e1d92064..0d704b82 100644 --- a/test_conformance/images/clGetInfo/test_1D.cpp +++ b/test_conformance/images/clGetInfo/test_1D.cpp @@ -15,11 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages; - extern int test_get_image_info_single( cl_context context, image_descriptor *imageInfo, MTdata d, cl_mem_flags flags, size_t row_pitch, size_t slice_pitch ); diff --git a/test_conformance/images/clGetInfo/test_1D_2D_array.cpp b/test_conformance/images/clGetInfo/test_1D_2D_array.cpp index c250e094..447fc7c2 100644 --- a/test_conformance/images/clGetInfo/test_1D_2D_array.cpp +++ b/test_conformance/images/clGetInfo/test_1D_2D_array.cpp @@ -15,11 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages; - extern int test_get_image_info_single( cl_context context, image_descriptor *imageInfo, MTdata d, cl_mem_flags flags, size_t row_pitch, size_t slice_pitch ); int test_get_image_info_1D_array( cl_device_id device, cl_context context, cl_image_format *format, cl_mem_flags flags ) diff --git a/test_conformance/images/clGetInfo/test_2D.cpp b/test_conformance/images/clGetInfo/test_2D.cpp index 49537075..74a60123 100644 --- a/test_conformance/images/clGetInfo/test_2D.cpp +++ b/test_conformance/images/clGetInfo/test_2D.cpp @@ -15,12 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages; - - int test_get_image_info_single( cl_context context, image_descriptor *imageInfo, MTdata d, cl_mem_flags flags, size_t row_pitch, size_t slice_pitch ) { int error; diff --git a/test_conformance/images/clGetInfo/test_3D.cpp b/test_conformance/images/clGetInfo/test_3D.cpp index 4bc189a4..af5062e3 100644 --- a/test_conformance/images/clGetInfo/test_3D.cpp +++ b/test_conformance/images/clGetInfo/test_3D.cpp @@ -15,11 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages; - extern int test_get_image_info_single( cl_context context, image_descriptor *imageInfo, MTdata d, cl_mem_flags flags, size_t row_pitch, size_t slice_pitch ); int test_get_image_info_3D( cl_device_id device, cl_context context, cl_image_format *format, cl_mem_flags flags ) diff --git a/test_conformance/images/clGetInfo/test_loops.cpp b/test_conformance/images/clGetInfo/test_loops.cpp index 9b0e9243..0abb14bf 100644 --- a/test_conformance/images/clGetInfo/test_loops.cpp +++ b/test_conformance/images/clGetInfo/test_loops.cpp @@ -15,18 +15,6 @@ // #include "../testBase.h" #include "../common.h" -#include "harness/imageHelpers.h" -#include -#include - -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern int gTypesToTest; -extern int gNormalizedModeToUse; -extern cl_channel_type gChannelTypeToUse; - - -extern bool gDebugTrace; extern int test_get_image_info_1D( cl_device_id device, cl_context context, cl_image_format *format, cl_mem_flags flags ); extern int test_get_image_info_2D( cl_device_id device, cl_context context, cl_image_format *format, cl_mem_flags flags );