star-3daw

commit 54d4cf826f2f25e403ed496776b7f8388a1c9b47
parent bfb1f5876a5cfd08a7df775fe68ed73c030c2f99
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon, 27 Nov 2017 15:44:05 +0100

Fix deprecations introduced by RSys 0.6

Diffstat:
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/test_s3daw.c
 | 
160
++++++++++++++++++++++++++++++++++++++++----------------------------------------

2 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -39,7 +39,7 @@ option(NO_TEST "Disable the test" OFF)
 find_package(AW 1.2.0 REQUIRED)
 find_package(Polygon 0.1 REQUIRED)
 find_package(RCMake 0.2 REQUIRED)
-find_package(RSys 0.3 REQUIRED)
+find_package(RSys 0.6 REQUIRED)
 find_package(Star3D 0.3 REQUIRED)
 
 include_directories(
diff --git a/src/test_s3daw.c b/src/test_s3daw.c
@@ -134,73 +134,73 @@ test_cbox(struct s3daw* s3daw)
 
   file = fopen("cbox.obj", "w");
 
-  NCHECK(file, NULL);
+  CHK(file != NULL);
   fwrite(cbox_obj, sizeof(char), strlen(cbox_obj), file);
   fclose(file);
 
   file = fopen("cbox.mtl", "w");
-  NCHECK(file, NULL);
+  CHK(file != NULL);
   fwrite(cbox_mtl, sizeof(char), strlen(cbox_mtl), file);
   fclose(file);
 
   remove("cbox2.mtl");
 
-  CHECK(s3daw_load(NULL, NULL), RES_BAD_ARG);
-  CHECK(s3daw_load(s3daw, NULL), RES_BAD_ARG);
-  CHECK(s3daw_load(NULL, "cbox.obj"), RES_BAD_ARG);
-  CHECK(s3daw_load(s3daw, "cbox.obj__"), RES_IO_ERR);
-  CHECK(s3daw_load(s3daw, "cbox.obj"), RES_OK);
+  CHK(s3daw_load(NULL, NULL) == RES_BAD_ARG);
+  CHK(s3daw_load(s3daw, NULL) == RES_BAD_ARG);
+  CHK(s3daw_load(NULL, "cbox.obj") == RES_BAD_ARG);
+  CHK(s3daw_load(s3daw, "cbox.obj__") == RES_IO_ERR);
+  CHK(s3daw_load(s3daw, "cbox.obj") == RES_OK);
 
   file = fopen("cbox2.mtl", "w");
-  NCHECK(file, NULL);
+  CHK(file != NULL);
   fwrite(cbox2_mtl, sizeof(char), strlen(cbox2_mtl), file);
   fclose(file);
 
-  CHECK(s3daw_load(s3daw, "cbox.obj"), RES_OK);
+  CHK(s3daw_load(s3daw, "cbox.obj") == RES_OK);
 
-  CHECK(s3daw_get_shapes_count(NULL, NULL), RES_BAD_ARG);
-  CHECK(s3daw_get_shapes_count(s3daw, NULL), RES_BAD_ARG);
-  CHECK(s3daw_get_shapes_count(NULL, &nshapes), RES_BAD_ARG);
-  CHECK(s3daw_get_shapes_count(s3daw, &nshapes), RES_OK);
-  CHECK(nshapes, 5);
+  CHK(s3daw_get_shapes_count(NULL, NULL) == RES_BAD_ARG);
+  CHK(s3daw_get_shapes_count(s3daw, NULL) == RES_BAD_ARG);
+  CHK(s3daw_get_shapes_count(NULL, &nshapes) == RES_BAD_ARG);
+  CHK(s3daw_get_shapes_count(s3daw, &nshapes) == RES_OK);
+  CHK(nshapes == 5);
 
-  CHECK(s3daw_get_shape(NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(s3daw_get_shape(s3daw, 0, NULL), RES_BAD_ARG);
-  CHECK(s3daw_get_shape(NULL, 0, &shape), RES_BAD_ARG);
+  CHK(s3daw_get_shape(NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(s3daw_get_shape(s3daw, 0, NULL) == RES_BAD_ARG);
+  CHK(s3daw_get_shape(NULL, 0, &shape) == RES_BAD_ARG);
   FOR_EACH(ishape, 0, nshapes)
-    CHECK(s3daw_get_shape(s3daw, 0, &shape), RES_OK);
-  CHECK(s3daw_get_shape(s3daw, nshapes, &shape), RES_BAD_ARG);
+    CHK(s3daw_get_shape(s3daw, 0, &shape) == RES_OK);
+  CHK(s3daw_get_shape(s3daw, nshapes, &shape) == RES_BAD_ARG);
 
-  CHECK(s3daw_clear(NULL), RES_BAD_ARG);
-  CHECK(s3daw_clear(s3daw), RES_OK);
-  CHECK(s3daw_get_shapes_count(s3daw, &nshapes), RES_OK);
-  CHECK(nshapes, 0);
-  CHECK(s3daw_get_shape(s3daw, 0, &shape), RES_BAD_ARG);
+  CHK(s3daw_clear(NULL) == RES_BAD_ARG);
+  CHK(s3daw_clear(s3daw) == RES_OK);
+  CHK(s3daw_get_shapes_count(s3daw, &nshapes) == RES_OK);
+  CHK(nshapes == 0);
+  CHK(s3daw_get_shape(s3daw, 0, &shape) == RES_BAD_ARG);
 
   file = fopen("cbox.obj", "r");
-  NCHECK(file, NULL);
+  CHK(file != NULL);
 
-  CHECK(s3daw_load_stream(s3daw, file), RES_OK);
-  CHECK(s3daw_get_shapes_count(s3daw, &nshapes), RES_OK);
-  CHECK(nshapes, 5);
+  CHK(s3daw_load_stream(s3daw, file) == RES_OK);
+  CHK(s3daw_get_shapes_count(s3daw, &nshapes) == RES_OK);
+  CHK(nshapes == 5);
   FOR_EACH(ishape, 0, nshapes)
-    CHECK(s3daw_get_shape(s3daw, ishape, &shape), RES_OK);
+    CHK(s3daw_get_shape(s3daw, ishape, &shape) == RES_OK);
 
-  CHECK(s3daw_get_s3d_device(s3daw, &s3d), RES_OK);
-  CHECK(s3d_scene_create(s3d, &scene), RES_OK);
+  CHK(s3daw_get_s3d_device(s3daw, &s3d) == RES_OK);
+  CHK(s3d_scene_create(s3d, &scene) == RES_OK);
 
-  CHECK(s3daw_attach_to_scene(NULL, NULL), RES_BAD_ARG);
-  CHECK(s3daw_attach_to_scene(s3daw, NULL), RES_BAD_ARG);
-  CHECK(s3daw_attach_to_scene(NULL, scene), RES_BAD_ARG);
-  CHECK(s3daw_attach_to_scene(s3daw, scene), RES_OK);
+  CHK(s3daw_attach_to_scene(NULL, NULL) == RES_BAD_ARG);
+  CHK(s3daw_attach_to_scene(s3daw, NULL) == RES_BAD_ARG);
+  CHK(s3daw_attach_to_scene(NULL, scene) == RES_BAD_ARG);
+  CHK(s3daw_attach_to_scene(s3daw, scene) == RES_OK);
 
-  CHECK(s3daw_detach_from_scene(NULL, NULL), RES_BAD_ARG);
-  CHECK(s3daw_detach_from_scene(s3daw, NULL), RES_BAD_ARG);
-  CHECK(s3daw_detach_from_scene(NULL, scene), RES_BAD_ARG);
-  CHECK(s3daw_detach_from_scene(s3daw, scene), RES_OK);
+  CHK(s3daw_detach_from_scene(NULL, NULL) == RES_BAD_ARG);
+  CHK(s3daw_detach_from_scene(s3daw, NULL) == RES_BAD_ARG);
+  CHK(s3daw_detach_from_scene(NULL, scene) == RES_BAD_ARG);
+  CHK(s3daw_detach_from_scene(s3daw, scene) == RES_OK);
 
-  CHECK(s3daw_detach_from_scene(s3daw, scene), RES_BAD_ARG);
-  CHECK(s3d_scene_ref_put(scene), RES_OK);
+  CHK(s3daw_detach_from_scene(s3daw, scene) == RES_BAD_ARG);
+  CHK(s3d_scene_ref_put(scene) == RES_OK);
 
   fclose(file);
 }
@@ -218,47 +218,47 @@ main(int argc, char** argv)
 
   mem_init_proxy_allocator(&allocator_proxy, &mem_default_allocator);
 
-  CHECK(s3d_device_create(NULL, &allocator_proxy, 0, &s3d), RES_OK);
-
-  CHECK(s3daw_create(NULL, NULL, NULL, NULL, NULL, 1, NULL), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, NULL, NULL, NULL, NULL, 1, &s3daw), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, NULL, NULL, NULL, s3d, 1,  NULL), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, NULL, NULL, NULL,s3d, 1, &s3daw), RES_OK);
-
-  CHECK(s3daw_ref_get(NULL), RES_BAD_ARG);
-  CHECK(s3daw_ref_get(s3daw), RES_OK);
-  CHECK(s3daw_ref_put(NULL), RES_BAD_ARG);
-  CHECK(s3daw_ref_put(s3daw), RES_OK);
-  CHECK(s3daw_ref_put(s3daw), RES_OK);
-
-  CHECK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, NULL, 1, NULL), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, NULL, 1, &s3daw), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, s3d, 1, NULL), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, s3d, 1, &s3daw), RES_OK);
-  CHECK(s3daw_ref_put(s3daw), RES_OK);
-
-  CHECK(s3daw_create
-    (LOGGER_DEFAULT, &allocator_proxy, NULL, NULL, s3d, 1, &s3daw), RES_OK);
-
-  CHECK(s3daw_get_loaders(NULL, NULL, NULL), RES_BAD_ARG);
-  CHECK(s3daw_get_loaders(s3daw, NULL, NULL), RES_OK); /* Useless */
-  CHECK(s3daw_get_loaders(NULL, &aw_obj, NULL), RES_BAD_ARG);
-  CHECK(s3daw_get_loaders(s3daw, &aw_obj, NULL), RES_OK);
-  CHECK(s3daw_get_loaders(NULL, NULL, &aw_mtl), RES_BAD_ARG);
-  CHECK(s3daw_get_loaders(s3daw, NULL, &aw_mtl), RES_OK);
-  CHECK(s3daw_get_loaders(NULL, &aw_obj, &aw_mtl), RES_BAD_ARG);
-  CHECK(s3daw_get_loaders(s3daw, &aw_obj, &aw_mtl), RES_OK);
-
-  CHECK(s3daw_get_s3d_device(NULL, NULL), RES_BAD_ARG);
-  CHECK(s3daw_get_s3d_device(s3daw, NULL), RES_BAD_ARG);
-  CHECK(s3daw_get_s3d_device(NULL, &s3d_tmp), RES_BAD_ARG);
-  CHECK(s3daw_get_s3d_device(s3daw, &s3d_tmp), RES_OK);
-  CHECK(s3d_tmp, s3d);
+  CHK(s3d_device_create(NULL, &allocator_proxy, 0, &s3d) == RES_OK);
+
+  CHK(s3daw_create(NULL, NULL, NULL, NULL, NULL, 1, NULL) == RES_BAD_ARG);
+  CHK(s3daw_create(NULL, NULL, NULL, NULL, NULL, 1, &s3daw) == RES_BAD_ARG);
+  CHK(s3daw_create(NULL, NULL, NULL, NULL, s3d, 1,  NULL) == RES_BAD_ARG);
+  CHK(s3daw_create(NULL, NULL, NULL, NULL,s3d, 1, &s3daw) == RES_OK);
+
+  CHK(s3daw_ref_get(NULL) == RES_BAD_ARG);
+  CHK(s3daw_ref_get(s3daw) == RES_OK);
+  CHK(s3daw_ref_put(NULL) == RES_BAD_ARG);
+  CHK(s3daw_ref_put(s3daw) == RES_OK);
+  CHK(s3daw_ref_put(s3daw) == RES_OK);
+
+  CHK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, NULL, 1, NULL) == RES_BAD_ARG);
+  CHK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, NULL, 1, &s3daw) == RES_BAD_ARG);
+  CHK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, s3d, 1, NULL) == RES_BAD_ARG);
+  CHK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, s3d, 1, &s3daw) == RES_OK);
+  CHK(s3daw_ref_put(s3daw) == RES_OK);
+
+  CHK(s3daw_create
+    (LOGGER_DEFAULT, &allocator_proxy, NULL, NULL, s3d, 1, &s3daw) == RES_OK);
+
+  CHK(s3daw_get_loaders(NULL, NULL, NULL) == RES_BAD_ARG);
+  CHK(s3daw_get_loaders(s3daw, NULL, NULL) == RES_OK); /* Useless */
+  CHK(s3daw_get_loaders(NULL, &aw_obj, NULL) == RES_BAD_ARG);
+  CHK(s3daw_get_loaders(s3daw, &aw_obj, NULL) == RES_OK);
+  CHK(s3daw_get_loaders(NULL, NULL, &aw_mtl) == RES_BAD_ARG);
+  CHK(s3daw_get_loaders(s3daw, NULL, &aw_mtl) == RES_OK);
+  CHK(s3daw_get_loaders(NULL, &aw_obj, &aw_mtl) == RES_BAD_ARG);
+  CHK(s3daw_get_loaders(s3daw, &aw_obj, &aw_mtl) == RES_OK);
+
+  CHK(s3daw_get_s3d_device(NULL, NULL) == RES_BAD_ARG);
+  CHK(s3daw_get_s3d_device(s3daw, NULL) == RES_BAD_ARG);
+  CHK(s3daw_get_s3d_device(NULL, &s3d_tmp) == RES_BAD_ARG);
+  CHK(s3daw_get_s3d_device(s3daw, &s3d_tmp) == RES_OK);
+  CHK(s3d_tmp == s3d);
 
   test_cbox(s3daw);
 
-  CHECK(s3daw_ref_put(s3daw), RES_OK);
-  CHECK(s3d_device_ref_put(s3d), RES_OK);
+  CHK(s3daw_ref_put(s3daw) == RES_OK);
+  CHK(s3d_device_ref_put(s3d) == RES_OK);
 
   if(MEM_ALLOCATED_SIZE(&allocator_proxy)) {
     char dump[512];
@@ -267,7 +267,7 @@ main(int argc, char** argv)
     FATAL("Memory leaks\n");
   }
   mem_shutdown_proxy_allocator(&allocator_proxy);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }