From e31e3a6694a20d21491d37b490dc744f35dc075a Mon Sep 17 00:00:00 2001 From: Radek Szymanski Date: Fri, 6 Nov 2020 12:24:46 +0100 Subject: [PATCH] Remove unused code in clReadWriteImage (#1043) These declarations either aren't used or aren't needed, as testBase.h already declares them. Signed-off-by: Radek Szymanski --- test_conformance/images/clReadWriteImage/main.cpp | 15 +-------------- .../images/clReadWriteImage/test_loops.cpp | 10 ---------- .../images/clReadWriteImage/test_read_1D.cpp | 9 --------- .../clReadWriteImage/test_read_1D_array.cpp | 9 --------- .../images/clReadWriteImage/test_read_2D.cpp | 9 --------- .../clReadWriteImage/test_read_2D_array.cpp | 7 ------- .../images/clReadWriteImage/test_read_3D.cpp | 7 ------- 7 files changed, 1 insertion(+), 65 deletions(-) diff --git a/test_conformance/images/clReadWriteImage/main.cpp b/test_conformance/images/clReadWriteImage/main.cpp index d8d096ee..5fd5367d 100644 --- a/test_conformance/images/clReadWriteImage/main.cpp +++ b/test_conformance/images/clReadWriteImage/main.cpp @@ -13,30 +13,20 @@ // 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; -bool gUseRamp; bool gTestMipmaps; -int gTypesToTest; cl_channel_type gChannelTypeToUse = (cl_channel_type)-1; cl_channel_order gChannelOrderToUse = (cl_channel_order)-1; bool gEnablePitch = false; -#define MAX_ALLOWED_STD_DEVIATION_IN_MB 8.0 - static void printUsage( const char *execName ); extern int test_image_set( cl_device_id device, cl_context context, cl_command_queue queue, cl_mem_object_type image_type ); @@ -99,8 +89,6 @@ int main(int argc, const char *argv[]) gTestMaxImages = true; else if( strcmp( argv[i], "use_pitches" ) == 0 ) gEnablePitch = true; - else if( strcmp( argv[i], "use_ramps" ) == 0 ) - gUseRamp = true; else if( strcmp( argv[i], "test_mipmaps") == 0 ) { gTestMipmaps = true; // Don't test pitches with mipmaps right now. @@ -142,7 +130,6 @@ static void printUsage( const char *execName ) log_info( "\tsmall_images - Runs every format through a loop of widths 1-13 and heights 1-9, instead of random sizes\n" ); log_info( "\tmax_images - Runs every format through a set of size combinations with the max values, max values - 1, and max values / 128\n" ); log_info( "\tuse_pitches - Enables row and slice pitches\n" ); - log_info( "\tuse_ramp - Instead of random data, uses images filled with ramps (and 0xff on any padding pixels) to ease debugging\n" ); log_info( "\ttest_mipmaps - Test mipmapped images\n" ); log_info( "\trandomize - Uses random seed\n" ); log_info( "\n" ); diff --git a/test_conformance/images/clReadWriteImage/test_loops.cpp b/test_conformance/images/clReadWriteImage/test_loops.cpp index e8ca8c8f..f0690e18 100644 --- a/test_conformance/images/clReadWriteImage/test_loops.cpp +++ b/test_conformance/images/clReadWriteImage/test_loops.cpp @@ -16,16 +16,6 @@ #include "../testBase.h" #include "../common.h" -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 bool gTestMipmaps; - extern int test_read_image_set_1D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format ); extern int test_read_image_set_2D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format ); extern int test_read_image_set_3D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format ); diff --git a/test_conformance/images/clReadWriteImage/test_read_1D.cpp b/test_conformance/images/clReadWriteImage/test_read_1D.cpp index 7d9eb845..8f996e8f 100644 --- a/test_conformance/images/clReadWriteImage/test_read_1D.cpp +++ b/test_conformance/images/clReadWriteImage/test_read_1D.cpp @@ -15,15 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern uint64_t gRoundingStartValue; - - int test_read_image_1D( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, MTdata d ) { int error; diff --git a/test_conformance/images/clReadWriteImage/test_read_1D_array.cpp b/test_conformance/images/clReadWriteImage/test_read_1D_array.cpp index 3f845564..ad0444d7 100644 --- a/test_conformance/images/clReadWriteImage/test_read_1D_array.cpp +++ b/test_conformance/images/clReadWriteImage/test_read_1D_array.cpp @@ -15,15 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern uint64_t gRoundingStartValue; - - int test_read_image_1D_array( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, MTdata d ) { int error; diff --git a/test_conformance/images/clReadWriteImage/test_read_2D.cpp b/test_conformance/images/clReadWriteImage/test_read_2D.cpp index 0eae51b5..7c205035 100644 --- a/test_conformance/images/clReadWriteImage/test_read_2D.cpp +++ b/test_conformance/images/clReadWriteImage/test_read_2D.cpp @@ -15,15 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern uint64_t gRoundingStartValue; - - int test_read_image_2D( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, MTdata d ) { int error; diff --git a/test_conformance/images/clReadWriteImage/test_read_2D_array.cpp b/test_conformance/images/clReadWriteImage/test_read_2D_array.cpp index 547e5eb4..6118e697 100644 --- a/test_conformance/images/clReadWriteImage/test_read_2D_array.cpp +++ b/test_conformance/images/clReadWriteImage/test_read_2D_array.cpp @@ -15,13 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; - int test_read_image_2D_array( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, MTdata d ) { int error; diff --git a/test_conformance/images/clReadWriteImage/test_read_3D.cpp b/test_conformance/images/clReadWriteImage/test_read_3D.cpp index 16baeebf..8f21ae94 100644 --- a/test_conformance/images/clReadWriteImage/test_read_3D.cpp +++ b/test_conformance/images/clReadWriteImage/test_read_3D.cpp @@ -15,13 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; - int test_read_image_3D( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, MTdata d ) { int error;