commit 8454e0187e369645c6d97e35faa3ea4c856520c7
parent b91255f7eaf87a10a0977dc6a59a223c98341e7f
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 4 May 2021 16:09:39 +0200
Update Star-SamPling to 0.9
Diffstat:
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cmake/core/CMakeLists.txt b/cmake/core/CMakeLists.txt
@@ -27,7 +27,7 @@ find_package(RCMake 0.3 REQUIRED)
find_package(RSys 0.11 REQUIRED)
find_package(Star3D 0.7.1 REQUIRED)
find_package(StarSF 0.6 REQUIRED)
-find_package(StarSP 0.8 REQUIRED)
+find_package(StarSP 0.9 REQUIRED)
find_package(OpenMP 1.2 REQUIRED)
find_package(MPI 1 REQUIRED)
diff --git a/src/core/htrdr_draw_map.c b/src/core/htrdr_draw_map.c
@@ -572,6 +572,8 @@ draw_map
#pragma omp parallel
for(;;) {
const int ithread = omp_get_thread_num();
+ struct ssp_rng_proxy_create2_args proxy_create2_args =
+ SSP_RNG_PROXY_CREATE2_ARGS_NULL;
struct ssp_rng_proxy* rng_proxy = NULL;
struct ssp_rng* rng;
struct tile* tile;
@@ -634,13 +636,15 @@ draw_map
* current thread only and thus it has to manage only one RNG. This proxy
* is initialised in order to ensure that an unique and predictable set of
* random numbers is used for the current tile. */
+ proxy_create2_args.type = &ssp_rng_threefry;
+ proxy_create2_args.sequence_offset = RNG_SEQUENCE_SIZE * (size_t)mcode;
+ proxy_create2_args.sequence_size = RNG_SEQUENCE_SIZE;
+ proxy_create2_args.sequence_pitch = RNG_SEQUENCE_SIZE * (size_t)ntiles_adjusted;
+ proxy_create2_args.nbuckets = 1;
SSP(rng_proxy_create2
(htrdr_get_thread_allocator(htrdr, (size_t)ithread),
- &ssp_rng_threefry,
- RNG_SEQUENCE_SIZE * (size_t)mcode, /* Offset */
- RNG_SEQUENCE_SIZE, /* Size */
- RNG_SEQUENCE_SIZE * (size_t)ntiles_adjusted, /* Pitch */
- 1, &rng_proxy));
+ &proxy_create2_args,
+ &rng_proxy));
SSP(rng_proxy_create_rng(rng_proxy, 0, &rng));
/* Launch the tile rendering */