Revision: 70032
http://sourceforge.net/p/brlcad/code/70032
Author: mdtwenty
Date: 2017-07-31 21:14:26 +0000 (Mon, 31 Jul 2017)
Log Message:
-----------
fixed some indentation and coding style issues
Modified Paths:
--------------
brlcad/branches/opencl/src/librt/primitives/bool.cl
brlcad/branches/opencl/src/librt/primitives/primitive_util.c
brlcad/branches/opencl/src/librt/primitives/rt.cl
Modified: brlcad/branches/opencl/src/librt/primitives/bool.cl
===================================================================
--- brlcad/branches/opencl/src/librt/primitives/bool.cl 2017-07-31 15:26:13 UTC
(rev 70031)
+++ brlcad/branches/opencl/src/librt/primitives/bool.cl 2017-07-31 21:14:26 UTC
(rev 70032)
@@ -638,7 +638,7 @@
// clear bit in mask
mask &= ~(1 << (31 - lz));
}
- if (ret) break;
+ if (ret) break;
}
stack[stackend++] = ret;
break;
@@ -665,7 +665,7 @@
for (uint i = 0; i < bv_index; i++) {
uint mask = segs_bv[pp_idx * bv_index + i];
while (mask != 0) {
- uint lz = clz(mask);
+ uint lz = clz(mask);
uint k = seg_idx + (31 - lz);
if (isset(segs_bv, pp_idx * bv_index, k - seg_idx) != 0) {
segp = segs+k;
@@ -676,7 +676,7 @@
}
}
// clear bit in mask
- mask &= ~(1 << (31 - lz));
+ mask &= ~(1 << (31 - lz));
}
}
}
@@ -726,7 +726,7 @@
int code, ret;
uint rt_index = total_regions/32 +1;
- uint lastregion_id;
+ uint lastregion_id;
// Get first region of the regiontable
for (uint i = 0; i < rt_index; i++) {
Modified: brlcad/branches/opencl/src/librt/primitives/primitive_util.c
===================================================================
--- brlcad/branches/opencl/src/librt/primitives/primitive_util.c
2017-07-31 15:26:13 UTC (rev 70031)
+++ brlcad/branches/opencl/src/librt/primitives/primitive_util.c
2017-07-31 21:14:26 UTC (rev 70032)
@@ -618,7 +618,7 @@
if (!clt_initialized) {
const char *main_files[] = {
"solver.cl",
- "bool.cl",
+ "bool.cl",
"arb8_shot.cl",
"bot_shot.cl",
@@ -887,18 +887,18 @@
cl_mem ph;
size_t sz_segs;
cl_mem psegs;
- size_t sz_ipartitions;
- cl_uint *ipart;
- cl_mem ipartitions;
- size_t sz_partitions;
- cl_mem ppartitions;
- cl_int max_depth;
- size_t sz_bv;
- cl_uint *bv;
- cl_mem segs_bv;
- size_t sz_regiontable;
- cl_uint *regiontable;
- cl_mem regiontable_bv;
+ size_t sz_ipartitions;
+ cl_uint *ipart;
+ cl_mem ipartitions;
+ size_t sz_partitions;
+ cl_mem ppartitions;
+ cl_int max_depth;
+ size_t sz_bv;
+ cl_uint *bv;
+ cl_mem segs_bv;
+ size_t sz_regiontable;
+ cl_uint *regiontable;
+ cl_mem regiontable_bv;
size_t snpix = swxh[0]*swxh[1];
sz_counts = sizeof(cl_int)*npix;
@@ -932,12 +932,12 @@
sz_h = sizeof(cl_uint)*(npix+1);
h = (cl_uint*)bu_calloc(1, sz_h, "h");
h[0] = 0;
- max_depth = 0;
+ max_depth = 0;
for (i=1; i<=npix; i++) {
BU_ASSERT((counts[i-1] % 2) == 0);
h[i] = h[i-1] + counts[i-1]/2; /* number of segs is half the
number of hits */
if (counts[i-1]/2 > max_depth)
- max_depth = counts[i-1]/2;
+ max_depth = counts[i-1]/2;
}
bu_free(counts, "counts");
@@ -946,15 +946,15 @@
sz_segs = sizeof(struct cl_seg)*h[npix];
- sz_ipartitions = sizeof(cl_uint)*npix; /* buffer to hold the
number of partitions per ray */
- sz_partitions = sizeof(struct cl_partition)*h[npix]*2; /*create
partition buffer with size= 2*number of segments */
- ipart = (cl_uint*)bu_calloc(1, sz_ipartitions, "ipart");
+ sz_ipartitions = sizeof(cl_uint)*npix; /* buffer to hold the number
of partitions per ray */
+ sz_partitions = sizeof(struct cl_partition)*h[npix]*2; /*create
partition buffer with size= 2*number of segments */
+ ipart = (cl_uint*)bu_calloc(1, sz_ipartitions, "ipart");
- sz_bv = sizeof(cl_uint)*(h[npix]*2)*(max_depth/32 + 1); /*
bitarray to represent the segs in each partition */
- bv = (cl_uint*)bu_calloc(1, sz_bv, "bv");
+ sz_bv = sizeof(cl_uint)*(h[npix]*2)*(max_depth/32 + 1); /* bitarray
to represent the segs in each partition */
+ bv = (cl_uint*)bu_calloc(1, sz_bv, "bv");
- sz_regiontable = sizeof(cl_uint)*npix*(clt_db_nregions/32 +1);
/* bitarray to represent the regions involved in each partition */
- regiontable = (cl_uint*)bu_calloc(1, sz_regiontable,
"regiontable");
+ sz_regiontable = sizeof(cl_uint)*npix*(clt_db_nregions/32 +1); /*
bitarray to represent the regions involved in each partition */
+ regiontable = (cl_uint*)bu_calloc(1, sz_regiontable, "regiontable");
bu_free(h, "h");
@@ -985,19 +985,19 @@
psegs = NULL;
}
- ipartitions = clCreateBuffer(clt_context,
CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR, sz_ipartitions, ipart, &error);
- if (error != CL_SUCCESS) bu_bomb("failed to create OpenCL index
partitions buffer");
- bu_free(ipart, "ipart");
+ ipartitions = clCreateBuffer(clt_context,
CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR, sz_ipartitions, ipart, &error);
+ if (error != CL_SUCCESS) bu_bomb("failed to create OpenCL index
partitions buffer");
+ bu_free(ipart, "ipart");
- segs_bv = clCreateBuffer(clt_context,
CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR, sz_bv, bv, &error);
- if (error != CL_SUCCESS) bu_bomb("failed to create OpenCL segs
bitvector buffer");
- bu_free(bv, "bv");
+ segs_bv = clCreateBuffer(clt_context,
CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR, sz_bv, bv, &error);
+ if (error != CL_SUCCESS) bu_bomb("failed to create OpenCL segs
bitvector buffer");
+ bu_free(bv, "bv");
- regiontable_bv = clCreateBuffer(clt_context,
CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR, sz_regiontable, regiontable, &error);
- if (error != CL_SUCCESS) bu_bomb("failed to create OpenCL segs
bitvector buffer");
- bu_free(regiontable, "regiontable");
+ regiontable_bv = clCreateBuffer(clt_context,
CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR, sz_regiontable, regiontable, &error);
+ if (error != CL_SUCCESS) bu_bomb("failed to create OpenCL segs
bitvector buffer");
+ bu_free(regiontable, "regiontable");
- if (sz_partitions != 0) {
+ if (sz_partitions != 0) {
ppartitions = clCreateBuffer(clt_context,
CL_MEM_READ_WRITE|CL_MEM_HOST_NO_ACCESS, sz_partitions, NULL, &error);
if (error != CL_SUCCESS) bu_bomb("failed to create OpenCL
partitions buffer");
@@ -1014,29 +1014,29 @@
error = clEnqueueNDRangeKernel(clt_queue, clt_boolweave_kernel,
1, NULL, &npix,
&snpix, 0, NULL, NULL);
bu_semaphore_release(clt_semaphore);
- } else {
+ } else {
ppartitions = NULL;
- }
+ }
- bu_semaphore_acquire(clt_semaphore);
- error = clSetKernelArg(clt_boolfinal_kernel, 0, sizeof(cl_mem),
&ppartitions);
- error |= clSetKernelArg(clt_boolfinal_kernel, 1,
sizeof(cl_mem), &ipartitions);
- error |= clSetKernelArg(clt_boolfinal_kernel, 2,
sizeof(cl_mem), &psegs);
- error |= clSetKernelArg(clt_boolfinal_kernel, 3,
sizeof(cl_mem), &ph);
- error |= clSetKernelArg(clt_boolfinal_kernel, 4,
sizeof(cl_mem), &segs_bv);
- error |= clSetKernelArg(clt_boolfinal_kernel, 5,
sizeof(cl_int), &max_depth);
- error |= clSetKernelArg(clt_boolfinal_kernel, 6,
sizeof(cl_mem), &clt_db_bool_regions);
- error |= clSetKernelArg(clt_boolfinal_kernel, 7,
sizeof(cl_uint), &clt_db_nregions);
- error |= clSetKernelArg(clt_boolfinal_kernel, 8,
sizeof(cl_mem), &clt_db_rtree);
- error |= clSetKernelArg(clt_boolfinal_kernel, 9,
sizeof(cl_mem), ®iontable_bv);
- error |= clSetKernelArg(clt_boolfinal_kernel, 10,
sizeof(cl_int), &p.cur_pixel);
- error |= clSetKernelArg(clt_boolfinal_kernel, 11,
sizeof(cl_int), &p.last_pixel);
- error |= clSetKernelArg(clt_boolfinal_kernel, 12,
sizeof(cl_mem), &clt_db_regions_table);
- error |= clSetKernelArg(clt_boolfinal_kernel, 13,
sizeof(cl_uint), &clt_db_regions_table_size);
- if (error != CL_SUCCESS) bu_bomb("failed to set OpenCL kernel
arguments");
- error = clEnqueueNDRangeKernel(clt_queue, clt_boolfinal_kernel,
1, NULL, &npix,
- &snpix, 0, NULL, NULL);
- bu_semaphore_release(clt_semaphore);
+ bu_semaphore_acquire(clt_semaphore);
+ error = clSetKernelArg(clt_boolfinal_kernel, 0, sizeof(cl_mem),
&ppartitions);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 1, sizeof(cl_mem),
&ipartitions);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 2, sizeof(cl_mem),
&psegs);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 3, sizeof(cl_mem),
&ph);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 4, sizeof(cl_mem),
&segs_bv);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 5, sizeof(cl_int),
&max_depth);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 6, sizeof(cl_mem),
&clt_db_bool_regions);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 7, sizeof(cl_uint),
&clt_db_nregions);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 8, sizeof(cl_mem),
&clt_db_rtree);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 9, sizeof(cl_mem),
®iontable_bv);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 10, sizeof(cl_int),
&p.cur_pixel);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 11, sizeof(cl_int),
&p.last_pixel);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 12, sizeof(cl_mem),
&clt_db_regions_table);
+ error |= clSetKernelArg(clt_boolfinal_kernel, 13, sizeof(cl_uint),
&clt_db_regions_table_size);
+ if (error != CL_SUCCESS) bu_bomb("failed to set OpenCL kernel
arguments");
+ error = clEnqueueNDRangeKernel(clt_queue, clt_boolfinal_kernel, 1,
NULL, &npix,
+ &snpix, 0, NULL, NULL);
+ bu_semaphore_release(clt_semaphore);
bu_semaphore_acquire(clt_semaphore);
error = clSetKernelArg(clt_shade_segs_kernel, 0, sizeof(cl_mem),
&ppixels);
@@ -1064,10 +1064,10 @@
error |= clSetKernelArg(clt_shade_segs_kernel, 22, sizeof(cl_mem),
&clt_db_indexes);
error |= clSetKernelArg(clt_shade_segs_kernel, 23, sizeof(cl_mem),
&clt_db_prims);
error |= clSetKernelArg(clt_shade_segs_kernel, 24, sizeof(cl_mem),
&clt_db_regions);
- error |= clSetKernelArg(clt_shade_segs_kernel, 25,
sizeof(cl_mem), &ppartitions);
- error |= clSetKernelArg(clt_shade_segs_kernel, 26,
sizeof(cl_mem), &ipartitions);
- error |= clSetKernelArg(clt_shade_segs_kernel, 27,
sizeof(cl_mem), &segs_bv);
- error |= clSetKernelArg(clt_shade_segs_kernel, 28,
sizeof(cl_int), &max_depth);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 25, sizeof(cl_mem),
&ppartitions);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 26, sizeof(cl_mem),
&ipartitions);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 27, sizeof(cl_mem),
&segs_bv);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 28, sizeof(cl_int),
&max_depth);
if (error != CL_SUCCESS) bu_bomb("failed to set OpenCL kernel
arguments");
error = clEnqueueNDRangeKernel(clt_queue, clt_shade_segs_kernel, 1,
NULL, &npix,
&snpix, 0, NULL, NULL);
@@ -1075,10 +1075,10 @@
clReleaseMemObject(ph);
clReleaseMemObject(psegs);
- clReleaseMemObject(ipartitions);
- clReleaseMemObject(ppartitions);
- clReleaseMemObject(segs_bv);
- clReleaseMemObject(regiontable_bv);
+ clReleaseMemObject(ipartitions);
+ clReleaseMemObject(ppartitions);
+ clReleaseMemObject(segs_bv);
+ clReleaseMemObject(regiontable_bv);
}
break;
default:
Modified: brlcad/branches/opencl/src/librt/primitives/rt.cl
===================================================================
--- brlcad/branches/opencl/src/librt/primitives/rt.cl 2017-07-31 15:26:13 UTC
(rev 70031)
+++ brlcad/branches/opencl/src/librt/primitives/rt.cl 2017-07-31 21:14:26 UTC
(rev 70032)
@@ -603,7 +603,7 @@
const double aspect, const int lightmodel, const uint nprims, global
uchar *ids,
global struct linear_bvh_node *nodes, global uint *indexes, global
uchar *prims,
global struct region *regions, global struct partition *partitions,
global uint *ipartition,
- global uint *segs_bv, const int max_depth)
+ global uint *segs_bv, const int max_depth)
{
const size_t id = get_global_size(0)*get_global_id(1)+get_global_id(0);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
