diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2014-04-20 12:51:58 -0400 |
|---|---|---|
| committer | Daniel Sabo <DanielSabo@gmail.com> | 2014-04-20 22:05:19 -0700 |
| commit | 75fc532a561ddcf3f4d50c26b94aa31b047abfa9 (patch) | |
| tree | 61928968386b46bc56a1082405aacbad5c946a44 | |
| parent | 29c45edd81cc4fb6efd1a46b87c217f18d4ca3f5 (diff) | |
noise-cell: remove static keywords
static keyword is not supported by OpenCL 1.1.
See Ch. 6.8 Restrictions, letter g)
| -rw-r--r-- | opencl/noise-cell.cl | 8 | ||||
| -rw-r--r-- | opencl/noise-cell.cl.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/opencl/noise-cell.cl b/opencl/noise-cell.cl index 1e555853..e3c223d0 100644 --- a/opencl/noise-cell.cl +++ b/opencl/noise-cell.cl @@ -3,7 +3,7 @@ /* Random feature counts following the Poisson distribution with lambda equal to 7. */ -static const __constant char poisson[256] = { +const __constant char poisson[256] = { 7, 9, 12, 12, 8, 7, 5, 5, 6, 7, 8, 6, 10, 7, 6, 2, 8, 3, 9, 5, 13, 10, 9, 8, 8, 9, 3, 8, 9, 6, 8, 7, 4, 9, 6, 3, 10, 7, 7, 7, 6, 7, 4, 14, 7, 6, 11, 7, 7, 7, 12, 7, 10, 6, 8, 11, 3, 5, 7, 7, 8, 7, 9, 8, 5, 8, 11, 3, 4, 5, 8, @@ -17,7 +17,7 @@ static const __constant char poisson[256] = { 9, 10, 8, 8, 6, 4, 9, 9, 8, 11, 6, 8, 13, 8, 9, 12, 6, 9, 8 }; -static uint +uint philox (uint s, uint t, uint k) @@ -38,13 +38,13 @@ philox (uint s, return s; } -static float +float lcg (uint *hash) { return (*hash = *hash * 1664525u + 1013904223u) / 4294967296.0f; } -static void +void search_box (float *closest, uint *feature, int s, diff --git a/opencl/noise-cell.cl.h b/opencl/noise-cell.cl.h index 775f5911..7ad09b47 100644 --- a/opencl/noise-cell.cl.h +++ b/opencl/noise-cell.cl.h @@ -4,7 +4,7 @@ static const char* noise_cell_cl_source = "/* Random feature counts following the Poisson distribution with \n" " lambda equal to 7. */ \n" " \n" -"static const __constant char poisson[256] = { \n" +"const __constant char poisson[256] = { \n" " 7, 9, 12, 12, 8, 7, 5, 5, 6, 7, 8, 6, 10, 7, 6, 2, 8, 3, 9, 5, 13, 10, 9, \n" " 8, 8, 9, 3, 8, 9, 6, 8, 7, 4, 9, 6, 3, 10, 7, 7, 7, 6, 7, 4, 14, 7, 6, 11, \n" " 7, 7, 7, 12, 7, 10, 6, 8, 11, 3, 5, 7, 7, 8, 7, 9, 8, 5, 8, 11, 3, 4, 5, 8, \n" @@ -18,7 +18,7 @@ static const char* noise_cell_cl_source = " 9, 10, 8, 8, 6, 4, 9, 9, 8, 11, 6, 8, 13, 8, 9, 12, 6, 9, 8 \n" "}; \n" " \n" -"static uint \n" +"uint \n" "philox (uint s, \n" " uint t, \n" " uint k) \n" @@ -39,13 +39,13 @@ static const char* noise_cell_cl_source = " return s; \n" "} \n" " \n" -"static float \n" +"float \n" "lcg (uint *hash) \n" "{ \n" " return (*hash = *hash * 1664525u + 1013904223u) / 4294967296.0f; \n" "} \n" " \n" -"static void \n" +"void \n" "search_box (float *closest, \n" " uint *feature, \n" " int s, \n" |