commit e5ab96a1a265e89f656d5b392da3f483aa1f55c0
parent 8077d0fb5673448b70cfb5698491f9bb169b5edd
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 2 Sep 2016 09:15:18 +0200
Minor code style review
Diffstat:
12 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/src/test_ssol_device.c b/src/test_ssol_device.c
@@ -39,7 +39,8 @@ main(int argc, char** argv)
CHECK(MEM_ALLOCATED_SIZE(&allocator), 0);
CHECK(ssol_device_create(NULL, &allocator, 2, 0, NULL), RES_BAD_ARG);
- CHECK(ssol_device_create(NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (NULL, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_device_ref_put(dev), RES_OK);
CHECK(MEM_ALLOCATED_SIZE(&allocator), 0);
@@ -49,15 +50,18 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
CHECK(ssol_device_create(&logger, NULL, 4, 0, NULL), RES_BAD_ARG);
- CHECK(ssol_device_create(&logger, NULL, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, NULL, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_device_ref_put(dev), RES_OK);
CHECK(ssol_device_create(&logger, &allocator, 2, 0, NULL), RES_BAD_ARG);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_device_ref_put(dev), RES_OK);
CHECK(ssol_device_create(&logger, &allocator, 0, 0, &dev), RES_BAD_ARG);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_device_ref_put(dev), RES_OK);
logger_release(&logger);
diff --git a/src/test_ssol_geometries.h b/src/test_ssol_geometries.h
@@ -24,7 +24,6 @@ struct desc {
/*******************************************************************************
* Plane
******************************************************************************/
-
static const float square_walls [] = {
-1, -1, 0,
1, -1, 0,
@@ -37,6 +36,7 @@ const unsigned square_walls_ids [] = {
0, 2, 1, 2, 0, 3
};
const unsigned square_walls_ntris = sizeof(square_walls_ids) / sizeof(unsigned[3]);
+
static const struct desc square_walls_desc = { square_walls, square_walls_ids };
/*******************************************************************************
diff --git a/src/test_ssol_image.c b/src/test_ssol_image.c
@@ -34,7 +34,8 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_ERROR, log_stream, NULL);
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_image_create(dev, &image), RES_OK);
diff --git a/src/test_ssol_material.c b/src/test_ssol_material.c
@@ -39,7 +39,8 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_ERROR, log_stream, NULL);
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_material_create_mirror(NULL, &material), RES_BAD_ARG);
CHECK(ssol_material_create_mirror(dev, NULL), RES_BAD_ARG);
diff --git a/src/test_ssol_materials.h b/src/test_ssol_materials.h
@@ -28,7 +28,7 @@ get_shader_normal
double* val)
{
int i;
- (void) dev, (void) wavelength, (void) P, (void) Ng, (void) uv, (void) w;
+ (void)dev, (void)wavelength, (void)P, (void)Ng, (void)uv, (void)w;
FOR_EACH(i, 0, 3) val[i] = Ns[i];
}
@@ -43,7 +43,7 @@ get_shader_reflectivity
const double w[3],
double* val)
{
- (void) dev, (void) wavelength, (void) P, (void) Ng, (void) Ns, (void) uv, (void) w;
+ (void)dev, (void)wavelength, (void)P, (void)Ng, (void)Ns, (void)uv, (void) w;
*val = 1;
}
@@ -58,7 +58,7 @@ get_shader_roughness
const double w[3],
double* val)
{
- (void) dev, (void) wavelength, (void) P, (void) Ng, (void) Ns, (void) uv, (void) w;
+ (void)dev, (void)wavelength, (void)P, (void)Ng, (void)Ns, (void)uv, (void) w;
*val = 0;
}
diff --git a/src/test_ssol_object.c b/src/test_ssol_object.c
@@ -36,7 +36,8 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_ERROR, log_stream, NULL);
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_material_create_virtual(dev, &material), RES_OK);
CHECK(ssol_shape_create_punched_surface(dev, &shape), RES_OK);
diff --git a/src/test_ssol_object_instance.c b/src/test_ssol_object_instance.c
@@ -38,7 +38,8 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_ERROR, log_stream, NULL);
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_material_create_virtual(dev, &material), RES_OK);
diff --git a/src/test_ssol_scene.c b/src/test_ssol_scene.c
@@ -41,7 +41,8 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_ERROR, log_stream, NULL);
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_material_create_virtual(dev, &material), RES_OK);
diff --git a/src/test_ssol_shape.c b/src/test_ssol_shape.c
@@ -42,7 +42,8 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_ERROR, log_stream, NULL);
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_shape_create_mesh(NULL, NULL), RES_BAD_ARG);
CHECK(ssol_shape_create_mesh(dev, NULL), RES_BAD_ARG);
@@ -62,20 +63,20 @@ main(int argc, char** argv)
attribs[2].usage = SSOL_TEXCOORD;
attribs[2].get = get_uv;
- CHECK(ssol_mesh_setup
- (NULL, box_walls_ntris, get_ids, box_walls_nverts, attribs, 1, (void*)&box_walls_desc), RES_BAD_ARG);
- CHECK(ssol_mesh_setup
- (shape, 0, get_ids, box_walls_nverts, attribs, 1, (void*)&box_walls_desc), RES_BAD_ARG);
- CHECK(ssol_mesh_setup
- (shape, box_walls_ntris, NULL, box_walls_nverts, attribs, 1, (void*)&box_walls_desc), RES_BAD_ARG);
- CHECK(ssol_mesh_setup
- (shape, box_walls_ntris, get_ids, 0, attribs, 1, (void*)&box_walls_desc), RES_BAD_ARG);
- CHECK(ssol_mesh_setup
- (shape, box_walls_ntris, get_ids, box_walls_nverts, NULL, 1, (void*)&box_walls_desc), RES_BAD_ARG);
- CHECK(ssol_mesh_setup
- (shape, box_walls_ntris, get_ids, box_walls_nverts, attribs, 0, (void*)&box_walls_desc), RES_BAD_ARG);
- CHECK(ssol_mesh_setup
- (shape, box_walls_ntris, get_ids, box_walls_nverts, attribs, 3, (void*)&box_walls_desc), RES_OK);
+ CHECK(ssol_mesh_setup(NULL, box_walls_ntris, get_ids, box_walls_nverts,
+ attribs, 1, (void*)&box_walls_desc), RES_BAD_ARG);
+ CHECK(ssol_mesh_setup(shape, 0, get_ids, box_walls_nverts, attribs, 1,
+ (void*)&box_walls_desc), RES_BAD_ARG);
+ CHECK(ssol_mesh_setup(shape, box_walls_ntris, NULL, box_walls_nverts,
+ attribs, 1, (void*)&box_walls_desc), RES_BAD_ARG);
+ CHECK(ssol_mesh_setup(shape, box_walls_ntris, get_ids, 0, attribs, 1,
+ (void*)&box_walls_desc), RES_BAD_ARG);
+ CHECK(ssol_mesh_setup(shape, box_walls_ntris, get_ids, box_walls_nverts,
+ NULL, 1, (void*)&box_walls_desc), RES_BAD_ARG);
+ CHECK(ssol_mesh_setup(shape, box_walls_ntris, get_ids, box_walls_nverts,
+ attribs, 0, (void*)&box_walls_desc), RES_BAD_ARG);
+ CHECK(ssol_mesh_setup(shape, box_walls_ntris, get_ids, box_walls_nverts,
+ attribs, 3, (void*)&box_walls_desc), RES_OK);
CHECK(ssol_shape_ref_put(shape), RES_OK);
diff --git a/src/test_ssol_solver.c b/src/test_ssol_solver.c
@@ -1,17 +1,17 @@
/* Copyright (C) CNRS 2016
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>. */
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "ssol.h"
#include "test_ssol_utils.h"
@@ -23,15 +23,12 @@
#include <rsys/logger.h>
#include <rsys/double33.h>
-#include <star/ssp.h>
-
-
-
#include <star/s3d.h>
+#include <star/ssp.h>
/*******************************************************************************
-* test main program
-******************************************************************************/
+ * Test main program
+ ******************************************************************************/
int
main(int argc, char** argv)
{
@@ -101,8 +98,8 @@ main(int argc, char** argv)
CHECK(ssol_shape_create_mesh(dev, &square), RES_OK);
attribs[0].usage = SSOL_POSITION;
attribs[0].get = get_position;
- CHECK(ssol_mesh_setup
- (square, square_walls_ntris, get_ids, square_walls_nverts, attribs, 1, (void*)&square_walls_desc), RES_OK);
+ CHECK(ssol_mesh_setup(square, square_walls_ntris, get_ids,
+ square_walls_nverts, attribs, 1, (void*)&square_walls_desc), RES_OK);
CHECK(ssol_material_create_mirror(dev, &m_material), RES_OK);
shader.normal = get_shader_normal;
diff --git a/src/test_ssol_spectrum.c b/src/test_ssol_spectrum.c
@@ -36,7 +36,8 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_ERROR, log_stream, NULL);
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_spectrum_create(NULL, &spectrum), RES_BAD_ARG);
CHECK(ssol_spectrum_create(dev, NULL), RES_BAD_ARG);
diff --git a/src/test_ssol_sun.c b/src/test_ssol_sun.c
@@ -37,7 +37,8 @@ main(int argc, char** argv)
logger_set_stream(&logger, LOG_ERROR, log_stream, NULL);
logger_set_stream(&logger, LOG_WARNING, log_stream, NULL);
- CHECK(ssol_device_create(&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
+ CHECK(ssol_device_create
+ (&logger, &allocator, SSOL_NTHREADS_DEFAULT, 0, &dev), RES_OK);
CHECK(ssol_spectrum_create(dev, &spectrum), RES_OK);
