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

remove min max macros (#1310)

Browse Source 
* remove the MIN and MAX macros and use the std versions instead

* fix formatting

* fix Arm build

* remove additional MIN and MAX macros from compat.h
This commit is contained in:
Ben Ashbaugh
2021-09-13 05:25:32 -07:00
committed by GitHub
parent 1f26e1d8ba
commit 02bf24d2b1
31 changed files with 241 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test_conformance/images/kernel_read_write/test_common.cpp
View File

@@ -16,6 +16,7 @@
#include "test_common.h"
#include <algorithm>
cl_sampler create_sampler(cl_context context, image_sampler_data *sdata, bool test_mipmaps, cl_int *error) {
cl_sampler sampler = nullptr;
@@ -934,13 +935,13 @@ int test_read_image(cl_context context, cl_command_queue queue,
{
err4 = 0.0f;
}
float maxErr1 = MAX(
float maxErr1 = std::max(
maxErr * maxPixel.p[0], FLT_MIN);
float maxErr2 = MAX(
float maxErr2 = std::max(
maxErr * maxPixel.p[1], FLT_MIN);
float maxErr3 = MAX(
float maxErr3 = std::max(
maxErr * maxPixel.p[2], FLT_MIN);
float maxErr4 = MAX(
float maxErr4 = std::max(
maxErr * maxPixel.p[3], FLT_MIN);
if (!(err1 <= maxErr1)
@@ -1039,17 +1040,17 @@ int test_read_image(cl_context context, cl_command_queue queue,
float err4 = ABS_ERROR(resultPtr[3],
expected[3]);
float maxErr1 =
MAX(maxErr * maxPixel.p[0],
FLT_MIN);
std::max(maxErr * maxPixel.p[0],
FLT_MIN);
float maxErr2 =
MAX(maxErr * maxPixel.p[1],
FLT_MIN);
std::max(maxErr * maxPixel.p[1],
FLT_MIN);
float maxErr3 =
MAX(maxErr * maxPixel.p[2],
FLT_MIN);
std::max(maxErr * maxPixel.p[2],
FLT_MIN);
float maxErr4 =
MAX(maxErr * maxPixel.p[3],
FLT_MIN);
std::max(maxErr * maxPixel.p[3],
FLT_MIN);
if (!(err1 <= maxErr1)