ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::vector for format lists in images suite (#1105)

Browse Source 
* Use std::vector for format lists in images suite

Avoids memory deallocation issues and generally simplifies the code.

* Fixup formatting with git-clang-format
This commit is contained in:
James Price
2021-01-14 08:27:59 -05:00
committed by GitHub
parent 0b6fbd15d1
commit 03a0989998
28 changed files with 280 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test_common/harness/imageHelpers.cpp
View File

@@ -269,7 +269,7 @@ int is_format_signed(const cl_image_format *format)
}
}
uint32_t get_pixel_size(cl_image_format *format)
uint32_t get_pixel_size(const cl_image_format *format)
{
switch (format->image_channel_data_type)
{
@@ -330,7 +330,7 @@ uint32_t next_power_of_two(uint32_t v)
return v;
}
uint32_t get_pixel_alignment(cl_image_format *format)
uint32_t get_pixel_alignment(const cl_image_format *format)
{
return next_power_of_two(get_pixel_size(format));
}
@@ -533,7 +533,7 @@ bool is_sRGBA_order(cl_channel_order image_channel_order)
// Format helpers
int has_alpha(cl_image_format *format)
int has_alpha(const cl_image_format *format)
{
switch (format->image_channel_order)
{
@@ -586,7 +586,7 @@ void get_max_sizes(
size_t maxWidth, size_t maxHeight, size_t maxDepth, size_t maxArraySize,
const cl_ulong maxIndividualAllocSize, // CL_DEVICE_MAX_MEM_ALLOC_SIZE
const cl_ulong maxTotalAllocSize, // CL_DEVICE_GLOBAL_MEM_SIZE
cl_mem_object_type image_type, cl_image_format *format,
cl_mem_object_type image_type, const cl_image_format *format,
int usingMaxPixelSizeBuffer)
{
@@ -797,7 +797,7 @@ void get_max_sizes(
}
}
float get_max_absolute_error(cl_image_format *format,
float get_max_absolute_error(const cl_image_format *format,
image_sampler_data *sampler)
{
if (sampler->filter_mode == CL_FILTER_NEAREST) return 0.0f;
@@ -816,7 +816,7 @@ float get_max_absolute_error(cl_image_format *format,
}
}
float get_max_relative_error(cl_image_format *format,
float get_max_relative_error(const cl_image_format *format,
image_sampler_data *sampler, int is3D,
int isLinearFilter)
{
@@ -899,7 +899,7 @@ float get_max_relative_error(cl_image_format *format,
return maxError;
}
size_t get_format_max_int(cl_image_format *format)
size_t get_format_max_int(const cl_image_format *format)
{
switch (format->image_channel_data_type)
{
@@ -932,7 +932,7 @@ size_t get_format_max_int(cl_image_format *format)
}
}
int get_format_min_int(cl_image_format *format)
int get_format_min_int(const cl_image_format *format)
{
switch (format->image_channel_data_type)
{
@@ -1247,7 +1247,7 @@ void read_image_pixel_float(void *imageData, image_descriptor *imageInfo, int x,
return;
}
cl_image_format *format = imageInfo->format;
const cl_image_format *format = imageInfo->format;
unsigned int i;
float tempData[4];
@@ -3571,8 +3571,8 @@ cl_float CoordWalker::Get(size_t idx, size_t el)
}
void print_read_header(cl_image_format *format, image_sampler_data *sampler,
bool err, int t)
void print_read_header(const cl_image_format *format,
image_sampler_data *sampler, bool err, int t)
{
const char *addressMode = NULL;
const char *normalizedNames[2] = { "UNNORMALIZED", "NORMALIZED" };
@@ -3638,7 +3638,7 @@ void print_read_header(cl_image_format *format, image_sampler_data *sampler,
}
}
void print_write_header(cl_image_format *format, bool err = false)
void print_write_header(const cl_image_format *format, bool err = false)
{
if (err)
log_error("[%-7s %-24s %d]\n",
@@ -3653,7 +3653,7 @@ void print_write_header(cl_image_format *format, bool err = false)
}
void print_header(cl_image_format *format, bool err = false)
void print_header(const cl_image_format *format, bool err = false)
{
if (err)
{

22
test_common/harness/imageHelpers.h
View File

@@ -76,11 +76,11 @@ int round_to_even(float v);
#define CONVERT_UINT(v, max, max_val) \
(v < 0 ? 0 : (v > max ? max_val : round_to_even(v)))
extern void print_read_header(cl_image_format *format,
extern void print_read_header(const cl_image_format *format,
image_sampler_data *sampler, bool err = false,
int t = 0);
extern void print_write_header(cl_image_format *format, bool err);
extern void print_header(cl_image_format *format, bool err);
extern void print_write_header(const cl_image_format *format, bool err);
extern void print_header(const cl_image_format *format, bool err);
extern bool find_format(cl_image_format *formatList, unsigned int numFormats,
cl_image_format *formatToFind);
extern bool is_image_format_required(cl_image_format format, cl_mem_flags flags,
@@ -98,7 +98,7 @@ extern uint32_t get_channel_order_channel_count(cl_channel_order order);
cl_channel_type get_channel_type_from_name(const char *name);
cl_channel_order get_channel_order_from_name(const char *name);
extern int is_format_signed(const cl_image_format *format);
extern uint32_t get_pixel_size(cl_image_format *format);
extern uint32_t get_pixel_size(const cl_image_format *format);
/* Helper to get any ol image format as long as it is 8-bits-per-channel */
extern int get_8_bit_image_format(cl_context context,
@@ -123,7 +123,7 @@ typedef struct
size_t rowPitch;
size_t slicePitch;
size_t arraySize;
cl_image_format *format;
const cl_image_format *format;
cl_mem buffer;
cl_mem_object_type type;
cl_uint num_mip_levels;
@@ -139,9 +139,9 @@ void get_max_sizes(size_t *numberOfSizes, const int maxNumberOfSizes,
size_t maxDepth, size_t maxArraySize,
const cl_ulong maxIndividualAllocSize,
const cl_ulong maxTotalAllocSize,
cl_mem_object_type image_type, cl_image_format *format,
cl_mem_object_type image_type, const cl_image_format *format,
int usingMaxPixelSize = 0);
extern size_t get_format_max_int(cl_image_format *format);
extern size_t get_format_max_int(const cl_image_format *format);
extern cl_ulong get_image_size(image_descriptor const *imageInfo);
extern cl_ulong get_image_size_mb(image_descriptor const *imageInfo);
@@ -173,7 +173,7 @@ extern void copy_image_data(image_descriptor *srcImageInfo,
void *destImageValues, const size_t sourcePos[],
const size_t destPos[], const size_t regionSize[]);
int has_alpha(cl_image_format *format);
int has_alpha(const cl_image_format *format);
extern bool is_sRGBA_order(cl_channel_order image_channel_order);
@@ -240,7 +240,7 @@ void read_image_pixel(void *imageData, image_descriptor *imageInfo, int x,
return;
}
cl_image_format *format = imageInfo->format;
const cl_image_format *format = imageInfo->format;
unsigned int i;
T tempData[4];
@@ -662,9 +662,9 @@ extern char *create_random_image_data(ExplicitType dataType,
extern void get_sampler_kernel_code(image_sampler_data *imageSampler,
char *outLine);
extern float get_max_absolute_error(cl_image_format *format,
extern float get_max_absolute_error(const cl_image_format *format,
image_sampler_data *sampler);
extern float get_max_relative_error(cl_image_format *format,
extern float get_max_relative_error(const cl_image_format *format,
image_sampler_data *sampler, int is3D,
int isLinearFilter);