htrdr

commit faae8986aecae1ca539f43362de29132bef3ff12
parent ea678437020ffb21c3a925decb1602a1e6da7f1a
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 28 Jan 2020 15:45:44 +0100

Remove the useless svx device/allocator

Diffstat:
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/htrdr.c
 | 
17
-----------------
M
src/htrdr.h
 | 
3
---

3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -122,7 +122,7 @@ rcmake_prepend_path(HTRDR_FILES_INC2 ${CMAKE_CURRENT_BINARY_DIR})
 rcmake_prepend_path(HTRDR_FILES_DOC ${PROJECT_SOURCE_DIR}/../)
 
 add_executable(htrdr ${HTRDR_FILES_SRC} ${HTRDR_FILES_INC} ${HTRDR_FILES_INC2})
-target_link_libraries(htrdr HTSky RSys Star3D Star3DAW StarSF StarSP StarVX)
+target_link_libraries(htrdr HTSky RSys Star3D Star3DAW StarSF StarSP)
 
 if(CMAKE_COMPILER_IS_GNUCC)
   target_link_libraries(htrdr m)
diff --git a/src/htrdr.c b/src/htrdr.c
@@ -33,7 +33,6 @@
 
 #include <star/s3d.h>
 #include <star/ssf.h>
-#include <star/svx.h>
 
 #include <errno.h>
 #include <fcntl.h> /* open */
@@ -397,9 +396,6 @@ htrdr_init
   htrdr->grid_max_definition[1] = args->grid_max_definition[1];
   htrdr->grid_max_definition[2] = args->grid_max_definition[2];
 
-  res = mem_init_regular_allocator(&htrdr->svx_allocator);
-  if(res != RES_OK) goto error;
-
   res = init_mpi(htrdr);
   if(res != RES_OK) goto error;
 
@@ -420,15 +416,6 @@ htrdr_init
     goto error;
   }
 
-  res = svx_device_create
-    (&htrdr->logger, &htrdr->svx_allocator, args->verbose, &htrdr->svx);
-  if(res != RES_OK) {
-    htrdr_log_err(htrdr,
-      "%s: could not create the Star-VoXel device -- %s.\n",
-      FUNC_NAME, res_to_cstr(res));
-    goto error;
-  }
-
   /* Disable the Star-3D verbosity since the Embree backend prints some messages
    * on stdout rather than stderr. This is annoying since stdout may be used by
    * htrdr to write output data */
@@ -521,7 +508,6 @@ htrdr_release(struct htrdr* htrdr)
   ASSERT(htrdr);
   release_mpi(htrdr);
   if(htrdr->s3d) S3D(device_ref_put(htrdr->s3d));
-  if(htrdr->svx) SVX(device_ref_put(htrdr->svx));
   if(htrdr->ground) htrdr_ground_ref_put(htrdr->ground);
   if(htrdr->sky) HTSKY(ref_put(htrdr->sky));
   if(htrdr->sun) htrdr_sun_ref_put(htrdr->sun);
@@ -536,9 +522,6 @@ htrdr_release(struct htrdr* htrdr)
   }
   str_release(&htrdr->output_name);
   logger_release(&htrdr->logger);
-
-  ASSERT(MEM_ALLOCATED_SIZE(&htrdr->svx_allocator) == 0);
-  mem_shutdown_regular_allocator(&htrdr->svx_allocator);
 }
 
 res_T
diff --git a/src/htrdr.h b/src/htrdr.h
@@ -41,10 +41,8 @@ struct s3d_device;
 struct s3d_scene;
 struct ssf_bsdf;
 struct ssf_phase;
-struct svx_device;
 
 struct htrdr {
-  struct svx_device* svx;
   struct s3d_device* s3d;
 
   struct htrdr_ground* ground;
@@ -81,7 +79,6 @@ struct htrdr {
 
   struct logger logger;
   struct mem_allocator* allocator;
-  struct mem_allocator svx_allocator;
   struct mem_allocator* lifo_allocators; /* Per thread lifo allocator */
 };