star-3daw

commit b867ffc299a30965c7d14fc068bd0f61ebb41b09
parent 5f8be7af07503154c28a85bbc0e5b70469521d77
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 17 Jun 2015 16:31:19 +0200

Update the s3daw_create API

Add a verbose parameter

Diffstat:
M
cmake/CMakeLists.txt
 | 
4
++--
M
src/s3daw.c
 | 
7
+++++--
M
src/s3daw.h
 | 
1
+
M
src/test_s3daw.c
 | 
18
+++++++++---------

4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -36,7 +36,7 @@ option(NO_TEST "Disable the test" OFF)
 ################################################################################
 # Check dependencies
 ################################################################################
-find_package(AW 1.0.2 REQUIRED)
+find_package(AW 1.1.0 REQUIRED)
 find_package(Polygon 0.0.3 REQUIRED)
 find_package(RCMake 0.1 REQUIRED)
 find_package(RSys 0.2 REQUIRED)
@@ -56,7 +56,7 @@ include(rcmake_runtime)
 # Configure and define targets
 ################################################################################
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
+set(VERSION_MINOR 1)
 set(VERSION_PATCH 0)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
diff --git a/src/s3daw.c b/src/s3daw.c
@@ -90,6 +90,7 @@ struct s3daw {
   ref_T ref;
   struct mem_allocator* allocator;
   struct logger* logger;
+  int verbose;
 
   struct aw_obj* loader_obj;
   struct aw_mtl* loader_mtl;
@@ -425,6 +426,7 @@ s3daw_create
    struct aw_obj* obj,
    struct aw_mtl* mtl,
    struct s3d_device* s3d,
+   const int verbose,
    struct s3daw** out_s3daw)
 {
   struct s3daw* s3daw = NULL;
@@ -445,6 +447,7 @@ s3daw_create
   ref_init(&s3daw->ref);
   s3daw->allocator = mem_allocator;
   s3daw->logger = logger ? logger : LOGGER_DEFAULT;
+  s3daw->verbose = verbose;
   S3D(device_ref_get(s3d));
   s3daw->s3d = s3d;
   darray_shape_init(s3daw->allocator, &s3daw->shapes);
@@ -462,7 +465,7 @@ s3daw_create
     AW(obj_ref_get(obj));
     s3daw->loader_obj = obj;
   } else {
-    res = aw_obj_create(logger, allocator, &s3daw->loader_obj);
+    res = aw_obj_create(logger, allocator, verbose, &s3daw->loader_obj);
     if(res != RES_OK) goto error;
   }
 
@@ -470,7 +473,7 @@ s3daw_create
     AW(mtl_ref_get(mtl));
     s3daw->loader_mtl = mtl;
   } else {
-    res = aw_mtl_create(logger, allocator, &s3daw->loader_mtl);
+    res = aw_mtl_create(logger, allocator, verbose, &s3daw->loader_mtl);
     if(res != RES_OK) goto error;
   }
 
diff --git a/src/s3daw.h b/src/s3daw.h
@@ -72,6 +72,7 @@ s3daw_create
    struct aw_obj* loader_obj, /* May be NULL <=> Internally create the loader */
    struct aw_mtl* loader_mtl, /* May be nULL <=> Internally create the loader */
    struct s3d_device* s3d,
+   const int verbose, /* Verbosity level */
    struct s3daw** s3daw);
 
 S3DAW_API res_T
diff --git a/src/test_s3daw.c b/src/test_s3daw.c
@@ -201,10 +201,10 @@ main(int argc, char** argv)
 
   CHECK(s3d_device_create(NULL, &allocator_proxy, 0, &s3d), RES_OK);
 
-  CHECK(s3daw_create(NULL, NULL, NULL, NULL, NULL, NULL), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, NULL, NULL, NULL, NULL, &s3daw), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, NULL, NULL, NULL, s3d, NULL), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, NULL, NULL, NULL,s3d, &s3daw), 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);
@@ -212,14 +212,14 @@ main(int argc, char** argv)
   CHECK(s3daw_ref_put(s3daw), RES_OK);
   CHECK(s3daw_ref_put(s3daw), RES_OK);
 
-  CHECK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, NULL, NULL), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, NULL, &s3daw), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, s3d, NULL), RES_BAD_ARG);
-  CHECK(s3daw_create(NULL, &allocator_proxy, NULL, NULL, s3d, &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, &s3daw), RES_OK);
+    (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 */