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 using namespace std and use std namespace explicitly (#2125)

Browse Source 
Removes `using namespace std` and adds `std::` explicitly instead, which
is usually on calls to `min`.

This is generally best practice, and it also might be helpful when there
are the same function names in the std namespace and in the global
namespace (e.g. #1833).
This commit is contained in:
Ben Ashbaugh
2024-10-29 09:44:49 -07:00
committed by GitHub
parent 8369028c92
commit d8228f0d72
13 changed files with 40 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test_conformance/gl/test_image_methods.cpp
View File

@@ -17,8 +17,6 @@
#include <algorithm>
using namespace std;
struct image_kernel_data
{
cl_int width;
@@ -383,17 +381,18 @@ int test_image_methods_depth(cl_device_id device, cl_context context,
glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT, &maxTextureRectangleSize);
glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &maxTextureLayers);
size = min(maxTextureSize, maxTextureRectangleSize);
size = std::min(maxTextureSize, maxTextureRectangleSize);
RandomSeed seed(gRandomSeed);
// Generate some random sizes (within reasonable ranges)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].height = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].width = random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].depth =
random_in_range(2, min(maxTextureLayers, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureLayers, 1 << (i + 4)), seed);
}
for (size_t i = 0; i < nsizes; i++)
@@ -440,11 +439,11 @@ int test_image_methods_multisample(cl_device_id device, cl_context context,
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].depth =
random_in_range(2, min(maxTextureLayers, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureLayers, 1 << (i + 4)), seed);
}
glEnable(GL_MULTISAMPLE);

6
test_conformance/gl/test_images_1D.cpp
View File

@@ -24,8 +24,6 @@
#endif
#include <algorithm>
using namespace std;
void calc_test_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit array size according to GL device properties
@@ -33,14 +31,14 @@ void calc_test_size_descriptors(sizevec_t* sizes, size_t nsizes)
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
glGetIntegerv(GL_MAX_TEXTURE_BUFFER_SIZE, &maxTextureBufferSize);
size = min(maxTextureSize, maxTextureBufferSize);
size = std::min(maxTextureSize, maxTextureBufferSize);
RandomSeed seed(gRandomSeed);
// Generate some random sizes (within reasonable ranges)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].width = random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].height = 1;
sizes[i].depth = 1;
}

5
test_conformance/gl/test_images_1Darray.cpp
View File

@@ -24,7 +24,6 @@
#endif
#include <algorithm>
using namespace std;
void calc_1D_array_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit array size according to GL device properties
@@ -38,9 +37,9 @@ void calc_1D_array_size_descriptors(sizevec_t* sizes, size_t nsizes)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, min(maxTextureLayers, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureLayers, 1 << (i + 4)), seed);
sizes[i].depth = 1;
}
}

14
test_conformance/gl/test_images_2D.cpp
View File

@@ -24,11 +24,6 @@
#endif
#include <algorithm>
using namespace std;
#pragma mark -
#pragma mark _2D read tests
void calc_2D_test_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit array size according to GL device properties
@@ -37,15 +32,16 @@ void calc_2D_test_size_descriptors(sizevec_t* sizes, size_t nsizes)
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT, &maxTextureRectangleSize);
size = min(maxTextureSize, maxTextureRectangleSize);
size = std::min(maxTextureSize, maxTextureRectangleSize);
RandomSeed seed(gRandomSeed);
// Generate some random sizes (within reasonable ranges)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].height = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].width = random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].depth = 1;
}
}
@@ -63,7 +59,7 @@ void calc_cube_test_size_descriptors(sizevec_t* sizes, size_t nsizes)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width = sizes[i].height =
random_in_range(2, min(maxQubeMapSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxQubeMapSize, 1 << (i + 4)), seed);
sizes[i].depth = 1;
}
}

8
test_conformance/gl/test_images_2Darray.cpp
View File

@@ -24,8 +24,6 @@
#endif
#include <algorithm>
using namespace std;
void calc_2D_array_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit array size according to GL device properties
@@ -39,11 +37,11 @@ void calc_2D_array_size_descriptors(sizevec_t* sizes, size_t nsizes)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].depth =
random_in_range(2, min(maxTextureLayers, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureLayers, 1 << (i + 4)), seed);
}
}

11
test_conformance/gl/test_images_3D.cpp
View File

@@ -24,11 +24,6 @@
#endif
#include <algorithm>
using namespace std;
#pragma mark -
#pragma mark _3D read test
void calc_3D_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit array size according to GL device properties
@@ -41,11 +36,11 @@ void calc_3D_size_descriptors(sizevec_t* sizes, size_t nsizes)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].depth =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
}
}

21
test_conformance/gl/test_images_depth.cpp
View File

@@ -25,11 +25,6 @@
#include <algorithm>
using namespace std;
#pragma mark -
#pragma mark _2D depth read tests
void calc_depth_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit texture size according to GL device properties
@@ -37,15 +32,16 @@ void calc_depth_size_descriptors(sizevec_t* sizes, size_t nsizes)
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT, &maxTextureRectangleSize);
size = min(maxTextureSize, maxTextureRectangleSize);
size = std::min(maxTextureSize, maxTextureRectangleSize);
RandomSeed seed(gRandomSeed);
// Generate some random sizes (within reasonable ranges)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].height = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].width = random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].depth = 1;
}
}
@@ -59,17 +55,18 @@ void calc_depth_array_size_descriptors(sizevec_t* sizes, size_t nsizes)
glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT, &maxTextureRectangleSize);
glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &maxTextureLayers);
size = min(maxTextureSize, maxTextureRectangleSize);
size = std::min(maxTextureSize, maxTextureRectangleSize);
RandomSeed seed(gRandomSeed);
// Generate some random sizes (within reasonable ranges)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].height = random_in_range(2, min(size, 1 << (i + 4)), seed);
sizes[i].width = random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, std::min(size, 1 << (i + 4)), seed);
sizes[i].depth =
random_in_range(2, min(maxTextureLayers, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureLayers, 1 << (i + 4)), seed);
}
}

12
test_conformance/gl/test_images_multisample.cpp
View File

@@ -25,8 +25,6 @@
#include <algorithm>
using namespace std;
void calc_2D_multisample_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit texture size according to GL device properties
@@ -39,9 +37,9 @@ void calc_2D_multisample_size_descriptors(sizevec_t* sizes, size_t nsizes)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].depth = 1;
}
}
@@ -59,11 +57,11 @@ void calc_2D_array_multisample_size_descriptors(sizevec_t* sizes, size_t nsizes)
for (size_t i = 0; i < nsizes; i++)
{
sizes[i].width =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].height =
random_in_range(2, min(maxTextureSize, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureSize, 1 << (i + 4)), seed);
sizes[i].depth =
random_in_range(2, min(maxTextureLayers, 1 << (i + 4)), seed);
random_in_range(2, std::min(maxTextureLayers, 1 << (i + 4)), seed);
}
}