From 1ff4632e895202c4485818f6e748e773b6fd2859 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sat, 22 Apr 2017 12:22:45 -0700 Subject: ray: remove vestigial ray_threads code Now that rototiller is generally threaded when a prepare_frame() method is supplied, and modules/ray has been updated accordingly, discard the now redundant ray-specific threading code and related stuff. --- src/modules/ray/ray_scene.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/modules/ray/ray_scene.c') diff --git a/src/modules/ray/ray_scene.c b/src/modules/ray/ray_scene.c index b4cddad..e2c7f2c 100644 --- a/src/modules/ray/ray_scene.c +++ b/src/modules/ray/ray_scene.c @@ -8,7 +8,6 @@ #include "ray_object.h" #include "ray_ray.h" #include "ray_scene.h" -#include "ray_threads.h" #define MAX_RECURSION_DEPTH 5 @@ -168,19 +167,3 @@ void ray_scene_render_fragment(ray_scene_t *scene, ray_camera_t *camera, fb_frag buf += stride; } while (ray_camera_frame_y_step(&frame)); } - -/* we expect fragments[threads->n_threads + 1], or fragments[1] when threads == NULL */ -void ray_scene_render_fragments(ray_scene_t *scene, ray_camera_t *camera, ray_threads_t *threads, fb_fragment_t *fragments) -{ - unsigned n_threads = threads ? threads->n_threads + 1 : 1; - unsigned i; - - for (i = 1; i < n_threads; i++) - ray_thread_fragment_submit(&threads->threads[i - 1], scene, camera, &fragments[i]); - - /* always render the zero fragment in-line */ - ray_scene_render_fragment(scene, camera, &fragments[0]); - - for (i = 1; i < n_threads; i++) - ray_thread_wait_idle(&threads->threads[i - 1]); -} -- cgit v1.2.1