aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-07-04 15:29:01 +0200
committerThomas White <taw@physics.org>2013-07-04 15:29:16 +0200
commit713124f2f38a7fd86d7f69a1d7b3f4feabedafb8 (patch)
tree9c0ec5905b47fc2fe8edfff4934e86291ad33e68
parentfc84233997e4245b17c67bde4e1f873a9e070d0b (diff)
Tidy up unused variables
-rw-r--r--src/cl-utils.c1
-rw-r--r--src/diffraction-gpu.c9
2 files changed, 2 insertions, 8 deletions
diff --git a/src/cl-utils.c b/src/cl-utils.c
index 71ff25b5..97efe2f8 100644
--- a/src/cl-utils.c
+++ b/src/cl-utils.c
@@ -209,6 +209,7 @@ static void show_build_log(cl_program prog, cl_device_id dev)
r = clGetProgramBuildInfo(prog, dev, CL_PROGRAM_BUILD_LOG, 4096, log,
&s);
+ STATUS("Status: %i\n", r);
STATUS("%s\n", log);
}
diff --git a/src/diffraction-gpu.c b/src/diffraction-gpu.c
index e90f2822..f41a45ec 100644
--- a/src/diffraction-gpu.c
+++ b/src/diffraction-gpu.c
@@ -271,7 +271,6 @@ void get_diffraction_gpu(struct gpu_context *gctx, struct image *image,
double bx, by, bz;
double cx, cy, cz;
cl_float16 cell;
- cl_int4 ncells;
cl_int err;
int n_inf = 0;
int n_neg = 0;
@@ -296,11 +295,6 @@ void get_diffraction_gpu(struct gpu_context *gctx, struct image *image,
cell.s[3] = bx; cell.s[4] = by; cell.s[5] = bz;
cell.s[6] = cx; cell.s[7] = cy; cell.s[8] = cz;
- ncells.s[0] = na;
- ncells.s[1] = nb;
- ncells.s[2] = nc;
- ncells.s[3] = 0; /* unused */
-
/* Ensure all required LUTs are available */
check_sinc_lut(gctx, na);
check_sinc_lut(gctx, nb);
@@ -366,14 +360,13 @@ void get_diffraction_gpu(struct gpu_context *gctx, struct image *image,
for ( fs=0; fs<image->width; fs++ ) {
for ( ss=0; ss<image->height; ss++ ) {
- struct rvec q;
double twotheta, k;
int idx;
/* Calculate k this time round */
k = 1.0/image->lambda;
- q = get_q(image, fs, ss, &twotheta, k);
+ get_q(image, fs, ss, &twotheta, k);
idx = fs + image->width*ss;
image->twotheta[idx] = twotheta;