[NFC] clang-format gl (#1612)

Add some clang-format off/on comments to keep kernel code readable.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2023-02-06 15:09:04 +00:00
committed by GitHub
parent 2318cedb21
commit f46cca0f8f
19 changed files with 3497 additions and 3027 deletions

View File

@@ -1,6 +1,6 @@
//
// Copyright (c) 2017 The Khronos Group Inc.
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
@@ -16,7 +16,7 @@
#include "testBase.h"
#include "common.h"
#if defined( __APPLE__ )
#if defined(__APPLE__)
#include <OpenGL/glu.h>
#else
#include <GL/glu.h>
@@ -32,129 +32,140 @@ using namespace std;
void calc_depth_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit texture size according to GL device properties
GLint maxTextureSize = 4096, maxTextureRectangleSize = 4096, size;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT, &maxTextureRectangleSize);
// Need to limit texture size according to GL device properties
GLint maxTextureSize = 4096, maxTextureRectangleSize = 4096, size;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT, &maxTextureRectangleSize);
size = min(maxTextureSize, maxTextureRectangleSize);
size = min(maxTextureSize, maxTextureRectangleSize);
RandomSeed seed( gRandomSeed );
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].depth = 1;
}
// 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].depth = 1;
}
}
void calc_depth_array_size_descriptors(sizevec_t* sizes, size_t nsizes)
{
// Need to limit texture size according to GL device properties
GLint maxTextureSize = 4096, maxTextureRectangleSize = 4096, maxTextureLayers = 16, size;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT, &maxTextureRectangleSize);
glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &maxTextureLayers);
// Need to limit texture size according to GL device properties
GLint maxTextureSize = 4096, maxTextureRectangleSize = 4096,
maxTextureLayers = 16, size;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT, &maxTextureRectangleSize);
glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &maxTextureLayers);
size = min(maxTextureSize, maxTextureRectangleSize);
size = min(maxTextureSize, maxTextureRectangleSize);
RandomSeed seed( gRandomSeed );
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].depth = random_in_range( 2, min(maxTextureLayers, 1<<(i+4)), seed );
}
// 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].depth =
random_in_range(2, min(maxTextureLayers, 1 << (i + 4)), seed);
}
}
int test_images_read_2D_depth( cl_device_id device, cl_context context,
cl_command_queue queue, int numElements )
int test_images_read_2D_depth(cl_device_id device, cl_context context,
cl_command_queue queue, int numElements)
{
if (!is_extension_available(device, "cl_khr_gl_depth_images")) {
log_info("Test not run because 'cl_khr_gl_depth_images' extension is not supported by the tested device\n");
return 0;
}
if (!is_extension_available(device, "cl_khr_gl_depth_images"))
{
log_info("Test not run because 'cl_khr_gl_depth_images' extension is "
"not supported by the tested device\n");
return 0;
}
RandomSeed seed( gRandomSeed );
RandomSeed seed(gRandomSeed);
GLenum targets[] = { GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_EXT };
size_t ntargets = sizeof(targets) / sizeof(targets[0]);
GLenum targets[] = { GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_EXT };
size_t ntargets = sizeof(targets) / sizeof(targets[0]);
size_t nformats = sizeof(depth_formats) / sizeof(depth_formats[0]);
size_t nformats = sizeof(depth_formats) / sizeof(depth_formats[0]);
const size_t nsizes = 8;
sizevec_t sizes[nsizes];
calc_depth_size_descriptors(sizes, nsizes);
const size_t nsizes = 8;
sizevec_t sizes[nsizes];
calc_depth_size_descriptors(sizes, nsizes);
return test_images_read_common(device, context, queue, depth_formats,
nformats, targets, ntargets, sizes, nsizes);
return test_images_read_common(device, context, queue, depth_formats,
nformats, targets, ntargets, sizes, nsizes);
}
#pragma mark -
#pragma mark _2D depth write tests
int test_images_write_2D_depth( cl_device_id device, cl_context context,
cl_command_queue queue, int numElements )
int test_images_write_2D_depth(cl_device_id device, cl_context context,
cl_command_queue queue, int numElements)
{
if (!is_extension_available(device, "cl_khr_gl_depth_images")) {
log_info("Test not run because 'cl_khr_gl_depth_images' extension is not supported by the tested device\n");
return 0;
}
if (!is_extension_available(device, "cl_khr_gl_depth_images"))
{
log_info("Test not run because 'cl_khr_gl_depth_images' extension is "
"not supported by the tested device\n");
return 0;
}
GLenum targets[] = { GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_EXT };
size_t ntargets = sizeof(targets) / sizeof(targets[0]);
size_t nformats = sizeof(depth_formats) / sizeof(depth_formats[0]);
GLenum targets[] = { GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_EXT };
size_t ntargets = sizeof(targets) / sizeof(targets[0]);
size_t nformats = sizeof(depth_formats) / sizeof(depth_formats[0]);
const size_t nsizes = 8;
sizevec_t sizes[nsizes];
calc_depth_size_descriptors(sizes, nsizes);
const size_t nsizes = 8;
sizevec_t sizes[nsizes];
calc_depth_size_descriptors(sizes, nsizes);
return test_images_write_common( device, context, queue, depth_formats,
nformats, targets, ntargets, sizes, nsizes );
return test_images_write_common(device, context, queue, depth_formats,
nformats, targets, ntargets, sizes, nsizes);
}
int test_images_read_2Darray_depth( cl_device_id device, cl_context context,
cl_command_queue queue, int )
int test_images_read_2Darray_depth(cl_device_id device, cl_context context,
cl_command_queue queue, int)
{
if (!is_extension_available(device, "cl_khr_gl_depth_images")) {
log_info("Test not run because 'cl_khr_gl_depth_images' extension is not supported by the tested device\n");
return 0;
}
if (!is_extension_available(device, "cl_khr_gl_depth_images"))
{
log_info("Test not run because 'cl_khr_gl_depth_images' extension is "
"not supported by the tested device\n");
return 0;
}
size_t nformats = sizeof(depth_formats) / sizeof(depth_formats[0]);
GLenum targets[] = { GL_TEXTURE_2D_ARRAY };
size_t ntargets = sizeof(targets) / sizeof(targets[0]);
size_t nformats = sizeof(depth_formats) / sizeof(depth_formats[0]);
GLenum targets[] = { GL_TEXTURE_2D_ARRAY };
size_t ntargets = sizeof(targets) / sizeof(targets[0]);
const size_t nsizes = 6;
sizevec_t sizes[nsizes];
calc_depth_array_size_descriptors(sizes, nsizes);
const size_t nsizes = 6;
sizevec_t sizes[nsizes];
calc_depth_array_size_descriptors(sizes, nsizes);
return test_images_read_common(device, context, queue, depth_formats,
nformats, targets, ntargets, sizes, nsizes);
return test_images_read_common(device, context, queue, depth_formats,
nformats, targets, ntargets, sizes, nsizes);
}
int test_images_write_2Darray_depth( cl_device_id device, cl_context context,
cl_command_queue queue, int numElements )
int test_images_write_2Darray_depth(cl_device_id device, cl_context context,
cl_command_queue queue, int numElements)
{
if (!is_extension_available(device, "cl_khr_gl_depth_images")) {
log_info("Test not run because 'cl_khr_gl_depth_images' extension is not supported by the tested device\n");
return 0;
}
if (!is_extension_available(device, "cl_khr_gl_depth_images"))
{
log_info("Test not run because 'cl_khr_gl_depth_images' extension is "
"not supported by the tested device\n");
return 0;
}
// FIXME: Query for 2D image array write support.
// FIXME: Query for 2D image array write support.
GLenum targets[] = { GL_TEXTURE_2D_ARRAY };
size_t ntargets = sizeof(targets) / sizeof(targets[0]);
size_t nformats = sizeof(depth_formats) / sizeof(depth_formats[0]);
GLenum targets[] = { GL_TEXTURE_2D_ARRAY };
size_t ntargets = sizeof(targets) / sizeof(targets[0]);
size_t nformats = sizeof(depth_formats) / sizeof(depth_formats[0]);
const size_t nsizes = 6;
sizevec_t sizes[nsizes];
calc_depth_array_size_descriptors(sizes, nsizes);
const size_t nsizes = 6;
sizevec_t sizes[nsizes];
calc_depth_array_size_descriptors(sizes, nsizes);
return test_images_write_common( device, context, queue, depth_formats,
nformats, targets, ntargets, sizes, nsizes );
return test_images_write_common(device, context, queue, depth_formats,
nformats, targets, ntargets, sizes, nsizes);
}