star-3d

commit eb04342ecda781aa7262c6844808b6c5cd9f3d29
parent 1fab474aecb6433ea98163ecd0f16c498be894cd
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 27 Jul 2016 10:26:18 +0200

Make the primitive test compliant with the session API

Diffstat:
M
src/test_s3d_primitive.c
 | 
16
+++++++++-------

1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/test_s3d_primitive.c b/src/test_s3d_primitive.c
@@ -86,6 +86,7 @@ main(int argc, char** argv)
   struct mem_allocator allocator;
   struct s3d_device* dev;
   struct s3d_scene* scn;
+  struct s3d_session* session;
   struct s3d_shape* walls;
   struct s3d_shape* plane;
   struct s3d_attrib attr;
@@ -127,9 +128,9 @@ main(int argc, char** argv)
   CHECK(s3d_mesh_setup_indexed_vertices
     (plane, plane_ntris, plane_get_ids, plane_nverts, &attribs, 1, NULL), RES_OK);
 
-  CHECK(s3d_scene_begin_session(scn, S3D_SAMPLE), RES_OK);
-  CHECK(s3d_scene_sample(scn, 0, 0, 0, &prim, uv), RES_OK);
-  CHECK(s3d_scene_end_session(scn), RES_OK);
+  CHECK(s3d_session_create(scn, S3D_SAMPLE, &session), RES_OK);
+  CHECK(s3d_session_sample(session, 0, 0, 0, &prim, uv), RES_OK);
+  CHECK(s3d_session_ref_put(session), RES_OK);
 
   CHECK(s3d_primitive_get_attrib(NULL, S3D_ATTRIBS_COUNT__, NULL, NULL), RES_BAD_ARG);
   CHECK(s3d_primitive_get_attrib(&prim, S3D_ATTRIBS_COUNT__, NULL, NULL), RES_BAD_ARG);
@@ -181,12 +182,13 @@ main(int argc, char** argv)
 
   CHECK(s3d_scene_clear(scn), RES_OK);
   CHECK(s3d_scene_attach_shape(scn, plane), RES_OK);
-  CHECK(s3d_scene_begin_session(scn, S3D_GET_PRIMITIVE), RES_OK);
-  CHECK(s3d_scene_primitives_count(scn, &nprims), RES_OK);
+
+  CHECK(s3d_session_create(scn, S3D_GET_PRIMITIVE, &session), RES_OK);
+  CHECK(s3d_session_primitives_count(session, &nprims), RES_OK);
   CHECK(nprims, 2);
-  CHECK(s3d_scene_get_primitive(scn, 0, &prim), RES_OK);
+  CHECK(s3d_session_get_primitive(session, 0, &prim), RES_OK);
   CHECK(S3D_PRIMITIVE_EQ(&prim, &S3D_PRIMITIVE_NULL), 0);
-  CHECK(s3d_scene_end_session(scn), RES_OK);
+  CHECK(s3d_session_ref_put(session), RES_OK);
 
   CHECK(s3d_primitive_compute_area(NULL, NULL), RES_BAD_ARG);
   CHECK(s3d_primitive_compute_area(&prim, NULL), RES_BAD_ARG);