From 5a535f9fac3f4b82f0b154b4c81fd1e2a8d62802 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 3 Apr 2011 21:30:15 -0400 Subject: Don't use awkward (*fptr)() syntax. --- libdimension/raytrace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libdimension/raytrace.c') diff --git a/libdimension/raytrace.c b/libdimension/raytrace.c index dbd0af3..23ccd4e 100644 --- a/libdimension/raytrace.c +++ b/libdimension/raytrace.c @@ -61,7 +61,7 @@ dmnsn_raytrace_scene_async(dmnsn_scene *scene) payload->progress = progress; payload->scene = scene; - dmnsn_new_thread(progress, &dmnsn_raytrace_scene_thread, payload); + dmnsn_new_thread(progress, dmnsn_raytrace_scene_thread, payload); return progress; } @@ -89,7 +89,7 @@ dmnsn_raytrace_scene_thread(void *ptr) /* Time the render itself */ payload->scene->render_timer = dmnsn_new_timer(); - int ret = dmnsn_execute_concurrently(&dmnsn_raytrace_scene_concurrent, + int ret = dmnsn_execute_concurrently(dmnsn_raytrace_scene_concurrent, payload, payload->scene->nthreads); dmnsn_complete_timer(payload->scene->render_timer); @@ -187,9 +187,9 @@ dmnsn_raytrace_scene_concurrent(void *ptr, unsigned int thread, /** Call the appropriate overloaded texture callback. */ #define TEXTURE_CALLBACK(state, telem, fn, def, ...) \ (CAN_CALL(ITEXTURE(state), telem, fn) \ - ? (*ITEXTURE(state)->telem->fn)(ITEXTURE(state)->telem, __VA_ARGS__) \ + ? ITEXTURE(state)->telem->fn(ITEXTURE(state)->telem, __VA_ARGS__) \ : (CAN_CALL(DTEXTURE(state), telem, fn) \ - ? (*DTEXTURE(state)->telem->fn)(DTEXTURE(state)->telem, __VA_ARGS__) \ + ? DTEXTURE(state)->telem->fn(DTEXTURE(state)->telem, __VA_ARGS__) \ : def)); /** Get a property from a texture element. */ @@ -250,7 +250,7 @@ dmnsn_raytrace_light_ray(const dmnsn_raytrace_state *state, * dmnsn_vector_dot(state->viewer, state->intersection->normal) < 0.0) return dmnsn_black; - dmnsn_color color = (*light->light_fn)(light, state->r); + dmnsn_color color = light->light_fn(light, state->r); unsigned int reclevel = state->reclevel; while (reclevel) { -- cgit v1.2.3