diff options
| author | Anthony LaTorre <tlatorre9@gmail.com> | 2011-08-12 20:55:21 -0400 |
|---|---|---|
| committer | Anthony LaTorre <tlatorre9@gmail.com> | 2011-08-12 20:55:21 -0400 |
| commit | 2610b77628c6c31feb167b40b6018fdfdb1846c3 (patch) | |
| tree | a5c59c0cf324c41363913ccce4b543e65124d72c /src/kernel.cu | |
| parent | 272c555f6b893a05f6d6a6439d519036e9379075 (diff) | |
| parent | 47738282858a7f30acef633ed0de2a6e933e9c7f (diff) | |
| download | chroma-2610b77628c6c31feb167b40b6018fdfdb1846c3.tar.gz chroma-2610b77628c6c31feb167b40b6018fdfdb1846c3.tar.bz2 chroma-2610b77628c6c31feb167b40b6018fdfdb1846c3.zip | |
merge
Diffstat (limited to 'src/kernel.cu')
| -rw-r--r-- | src/kernel.cu | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/kernel.cu b/src/kernel.cu index a26460a..cc567b8 100644 --- a/src/kernel.cu +++ b/src/kernel.cu @@ -292,7 +292,24 @@ __global__ void ray_trace_alpha(int nthreads, float3 *positions, float3 *directi } // ray_trace -__global__ void propagate(int first_photon, int nthreads, int *photon_offsets, curandState *rng_states, +__global__ void swap(int *values, int nswap, int *offset_a, int *offset_b) +{ + int id = blockIdx.x*blockDim.x + threadIdx.x; + + if (id < nswap) { + int a = offset_a[id]; + int b = offset_b[id]; + + int tmp = values[a]; + values[a] = values[b]; + values[b] = tmp; + } +} + +__global__ void propagate(int first_photon, int nthreads, + unsigned int *input_queue, + unsigned int *output_queue, + curandState *rng_states, float3 *positions, float3 *directions, float *wavelengths, float3 *polarizations, float *times, unsigned int *histories, int *last_hit_triangles, int max_steps) { @@ -303,7 +320,7 @@ __global__ void propagate(int first_photon, int nthreads, int *photon_offsets, c curandState rng = rng_states[id]; - int photon_id = photon_offsets[first_photon + id]; + int photon_id = input_queue[first_photon + id]; Photon p; p.position = positions[photon_id]; @@ -364,7 +381,12 @@ __global__ void propagate(int first_photon, int nthreads, int *photon_offsets, c times[photon_id] = p.time; histories[photon_id] = p.history; last_hit_triangles[photon_id] = p.last_hit_triangle; - + + // Not done, put photon in output queue + if ( (p.history & (NO_HIT | BULK_ABSORB | SURFACE_DETECT | SURFACE_ABSORB)) == 0) { + int out_idx = atomicAdd(output_queue, 1); + output_queue[out_idx] = photon_id; + } } // propagate } // extern "c" |