diff options
| author | Thomas White <taw@physics.org> | 2011-03-07 10:50:51 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:17 +0100 |
| commit | b6c119939fcd95041c48035b27ebceaa19a4812e (patch) | |
| tree | db0e22bf629a5b4b87f5f8ae107b6b0227724daa /src | |
| parent | ef764dd150e7be5438a3277cfcb8a6270b9ecd00 (diff) | |
setup_gpu() does not need an image
Diffstat (limited to 'src')
| -rw-r--r-- | src/diffraction-gpu.c | 2 | ||||
| -rw-r--r-- | src/diffraction-gpu.h | 4 | ||||
| -rw-r--r-- | src/pattern_sim.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/diffraction-gpu.c b/src/diffraction-gpu.c index e7449148..59f19809 100644 --- a/src/diffraction-gpu.c +++ b/src/diffraction-gpu.c @@ -342,7 +342,7 @@ void get_diffraction_gpu(struct gpu_context *gctx, struct image *image, /* Setup the OpenCL stuff, create buffers, load the structure factor table */ -struct gpu_context *setup_gpu(int no_sfac, struct image *image, +struct gpu_context *setup_gpu(int no_sfac, const double *intensities, unsigned char *flags, const char *sym, int dev_num) { diff --git a/src/diffraction-gpu.h b/src/diffraction-gpu.h index 639455a6..a3bde4e1 100644 --- a/src/diffraction-gpu.h +++ b/src/diffraction-gpu.h @@ -25,7 +25,7 @@ struct gpu_context; extern void get_diffraction_gpu(struct gpu_context *gctx, struct image *image, int na, int nb, int nc, UnitCell *ucell); -extern struct gpu_context *setup_gpu(int no_sfac, struct image *image, +extern struct gpu_context *setup_gpu(int no_sfac, const double *intensities, const unsigned char *flags, const char *sym, int dev_num); @@ -40,7 +40,7 @@ static void get_diffraction_gpu(struct gpu_context *gctx, struct image *image, ERROR("This copy of CrystFEL was not compiled with OpenCL support.\n"); } -static struct gpu_context *setup_gpu(int no_sfac, struct image *image, +static struct gpu_context *setup_gpu(int no_sfac, const double *intensities, const unsigned char *flags, const char *sym, int dev_num) diff --git a/src/pattern_sim.c b/src/pattern_sim.c index 29e1b263..c823c3a3 100644 --- a/src/pattern_sim.c +++ b/src/pattern_sim.c @@ -533,7 +533,7 @@ int main(int argc, char *argv[]) if ( config_gpu ) { if ( gctx == NULL ) { - gctx = setup_gpu(config_nosfac, &image, + gctx = setup_gpu(config_nosfac, intensities, flags, sym, gpu_dev); } |