tRemoved ref. by string from cameraInit - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
(HTM) git clone git://src.adamsgaard.dk/sphere
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit d8cd8d4dbb475bebee247a0460b65242772505d9
(DIR) parent f9351160ecc1458341df02017d7cd198e63ee776
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Thu, 14 Mar 2013 06:03:35 +0100
Removed ref. by string from cameraInit
Diffstat:
M src/raytracer.cuh | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
---
(DIR) diff --git a/src/raytracer.cuh b/src/raytracer.cuh
t@@ -309,6 +309,7 @@ __host__ void DEM::cameraInit(
if (verbose == 1)
std::cout << " Transfering camera values to constant memory: ";
+ /* Reference by string removed in cuda 5.0
cudaMemcpyToSymbol("devC_u", &u, sizeof(u));
cudaMemcpyToSymbol("devC_v", &v, sizeof(v));
cudaMemcpyToSymbol("devC_w", &w, sizeof(w));
t@@ -316,7 +317,15 @@ __host__ void DEM::cameraInit(
cudaMemcpyToSymbol("devC_imgplane", &imgplane, sizeof(imgplane));
cudaMemcpyToSymbol("devC_d", &d, sizeof(d));
cudaMemcpyToSymbol("devC_light", &light, sizeof(light));
- cudaMemcpyToSymbol("devC_pixels", &pixels, sizeof(pixels));
+ cudaMemcpyToSymbol("devC_pixels", &pixels, sizeof(pixels));*/
+ cudaMemcpyToSymbol(devC_u, &u, sizeof(u));
+ cudaMemcpyToSymbol(devC_v, &v, sizeof(v));
+ cudaMemcpyToSymbol(devC_w, &w, sizeof(w));
+ cudaMemcpyToSymbol(devC_eye, &eye, sizeof(eye));
+ cudaMemcpyToSymbol(devC_imgplane, &imgplane, sizeof(imgplane));
+ cudaMemcpyToSymbol(devC_d, &d, sizeof(d));
+ cudaMemcpyToSymbol(devC_light, &light, sizeof(light));
+ cudaMemcpyToSymbol(devC_pixels, &pixels, sizeof(pixels));
if (verbose == 1)
std::cout << "Done" << std::endl;