Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /trunk/src/include/Diderot/diderot.h
ViewVC logotype

Diff of /trunk/src/include/Diderot/diderot.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1295, Thu Jun 9 06:42:54 2011 UTC revision 1301, Thu Jun 9 23:58:40 2011 UTC
# Line 16  Line 16 
16    
17  #include "Diderot/config.h"  #include "Diderot/config.h"
18    
19    // include OpenCL headers when the target is OpenCL
20    #if defined(DIDEROT_TARGET_CL)
21    # ifdef HAVE_CL_CL_H
22    #   include <CL/cl.h>
23    # elif defined(HAVE_OPENCL_CL_H)
24    #   include <OpenCL/cl.h>
25    # else
26    #   error no cl.h
27    # endif
28    #endif
29    
30  /* gcc has a bug that breaks code that uses 8-byte vectors (e.g., vec2f_t), but clang  /* gcc has a bug that breaks code that uses 8-byte vectors (e.g., vec2f_t), but clang
31   * handles the code correctly.   * handles the code correctly.
32   */   */
# Line 37  Line 48 
48    
49  #include "types.h"  #include "types.h"
50  #include "strands.h"  #include "strands.h"
51    #include "options.h"
52    
53  /* load image data from Nrrd files */  /* load image data from Nrrd files */
54  extern Status_t Diderot_LoadImage1D (Diderot_string_t name, Diderot_image1D_t **img);  extern Status_t Diderot_LoadImage1D (Diderot_string_t name, Diderot_image1D_t **img);
55  extern Status_t Diderot_LoadImage2D (Diderot_string_t name, Diderot_image2D_t **img);  extern Status_t Diderot_LoadImage2D (Diderot_string_t name, Diderot_image2D_t **img);
56  extern Status_t Diderot_LoadImage3D (Diderot_string_t name, Diderot_image3D_t **img);  extern Status_t Diderot_LoadImage3D (Diderot_string_t name, Diderot_image3D_t **img);
57    
 /* functions to get input-parameter values */  
 extern Status_t Diderot_InputString (const char *, const char **, bool);  
 extern Status_t Diderot_InputReal (const char *, Diderot_real_t *, bool);  
 extern Status_t Diderot_InputVec2 (const char *, Diderot_vec2_t *, bool);  
 extern Status_t Diderot_InputVec3 (const char *, Diderot_vec3_t *, bool);  
   
58  /* function to get information about the CPU configuration */  /* function to get information about the CPU configuration */
59    
60  //! Summary information about the CPU configuration.  //! Summary information about the CPU configuration.
# Line 64  Line 70 
70  //! \brief function to get information about the CPU configuration  //! \brief function to get information about the CPU configuration
71  bool GetNumCPUs (CPUInfo_t *info);  bool GetNumCPUs (CPUInfo_t *info);
72    
73    //! get the current time in seconds
74    double GetTime ();
75    
76    
77  /********** scalar math functions **********/  /********** scalar math functions **********/
78    

Legend:
Removed from v.1295  
changed lines
  Added in v.1301

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0