Revision: 70137
http://sourceforge.net/p/brlcad/code/70137
Author: mdtwenty
Date: 2017-08-27 20:46:40 +0000 (Sun, 27 Aug 2017)
Log Message:
-----------
removing unused kernel arguments
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/bool.cl
brlcad/trunk/src/librt/primitives/primitive_util.c
brlcad/trunk/src/librt/primitives/rt.cl
Modified: brlcad/trunk/src/librt/primitives/bool.cl
===================================================================
--- brlcad/trunk/src/librt/primitives/bool.cl 2017-08-27 17:11:22 UTC (rev
70136)
+++ brlcad/trunk/src/librt/primitives/bool.cl 2017-08-27 20:46:40 UTC (rev
70137)
@@ -534,8 +534,8 @@
}
int
-bool_eval(global struct partition *partitions, global uint *ipartition,
RESULT_TYPE segs,
- global uint *h, global uint *segs_bv, const uint bv_index, uint
offset, size_t id,
+bool_eval(global struct partition *partitions, RESULT_TYPE segs, global uint
*h,
+ global uint *segs_bv, const uint bv_index, uint offset, size_t id,
global struct bool_region *bregions, global struct tree_bit *btree,
const uint region_index)
{
int sp[BOOL_STACKSIZE];
@@ -839,11 +839,11 @@
}
__kernel void
-rt_boolfinal(global struct partition *partitions, global uint *ipartition,
RESULT_TYPE segs,
+rt_boolfinal(global struct partition *partitions, global uint *head_partition,
RESULT_TYPE segs,
global uint *h, global uint *segs_bv, const int max_depth,
global struct bool_region *bregions, const uint total_regions, global
struct tree_bit *rtree,
global uint *regiontable, const int cur_pixel, const int last_pixel,
- global uint *regions_table, const uint regions_table_size, global uint
*head_partition)
+ global uint *regions_table)
{
const size_t id = get_global_size(0)*get_global_id(1)+get_global_id(0);
@@ -924,7 +924,7 @@
lastregion_idx = k;
}
- else if (bool_eval(partitions, ipartition, segs, h,
segs_bv, bv_index, current_index, id, bregions, rtree, k) == BOOL_TRUE) {
+ else if (bool_eval(partitions, segs, h, segs_bv, bv_index,
current_index, id, bregions, rtree, k) == BOOL_TRUE) {
/* This region claims partition */
claiming_regions++;
lastregion_idx = k;
Modified: brlcad/trunk/src/librt/primitives/primitive_util.c
===================================================================
--- brlcad/trunk/src/librt/primitives/primitive_util.c 2017-08-27 17:11:22 UTC
(rev 70136)
+++ brlcad/trunk/src/librt/primitives/primitive_util.c 2017-08-27 20:46:40 UTC
(rev 70137)
@@ -485,7 +485,7 @@
static cl_mem clt_db_ids, clt_db_indexes, clt_db_prims, clt_db_bvh,
clt_db_regions, clt_db_iregions;
static cl_mem clt_db_rtree, clt_db_bool_regions, clt_db_regions_table;
static cl_uint clt_db_nprims;
-static cl_uint clt_db_nregions, clt_db_regions_table_size;
+static cl_uint clt_db_nregions;
@@ -804,8 +804,6 @@
clt_db_regions_table = clCreateBuffer(clt_context,
CL_MEM_READ_ONLY|CL_MEM_HOST_WRITE_ONLY|CL_MEM_COPY_HOST_PTR,
sizeof(cl_uint)*regions_table_size, regions_table, &error);
if (error != CL_SUCCESS) bu_bomb("failed to create OpenCL regions_table
buffer");
}
-
- clt_db_regions_table_size = regions_table_size;
}
void
@@ -823,7 +821,6 @@
clt_db_nprims = 0;
clt_db_nregions = 0;
- clt_db_regions_table_size = 0;
}
void
@@ -1063,7 +1060,7 @@
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, 1, sizeof(cl_mem),
&head_partition);
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);
@@ -1075,8 +1072,6 @@
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);
- error |= clSetKernelArg(clt_boolfinal_kernel, 14, sizeof(cl_mem),
&head_partition);
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);
@@ -1086,7 +1081,7 @@
error = clSetKernelArg(clt_shade_segs_kernel, 0, sizeof(cl_mem),
&ppixels);
error |= clSetKernelArg(clt_shade_segs_kernel, 1, sizeof(cl_uchar3),
&p.o);
error |= clSetKernelArg(clt_shade_segs_kernel, 2, sizeof(cl_mem),
&psegs);
- error |= clSetKernelArg(clt_shade_segs_kernel, 3, sizeof(cl_mem), &ph);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 3, sizeof(cl_mem),
&head_partition);
error |= clSetKernelArg(clt_shade_segs_kernel, 4, sizeof(cl_int),
&p.cur_pixel);
error |= clSetKernelArg(clt_shade_segs_kernel, 5, sizeof(cl_int),
&p.last_pixel);
error |= clSetKernelArg(clt_shade_segs_kernel, 6, sizeof(cl_int),
&p.width);
@@ -1102,17 +1097,11 @@
error |= clSetKernelArg(clt_shade_segs_kernel, 16, sizeof(cl_double),
&p.cell_height);
error |= clSetKernelArg(clt_shade_segs_kernel, 17, sizeof(cl_double),
&p.aspect);
error |= clSetKernelArg(clt_shade_segs_kernel, 18, sizeof(cl_int),
&lightmodel);
- error |= clSetKernelArg(clt_shade_segs_kernel, 19, sizeof(cl_uint),
&clt_db_nprims);
- error |= clSetKernelArg(clt_shade_segs_kernel, 20, sizeof(cl_mem),
&clt_db_ids);
- error |= clSetKernelArg(clt_shade_segs_kernel, 21, sizeof(cl_mem),
&clt_db_bvh);
- 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, 29, sizeof(cl_mem),
&head_partition);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 19, sizeof(cl_mem),
&clt_db_ids);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 20, sizeof(cl_mem),
&clt_db_indexes);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 21, sizeof(cl_mem),
&clt_db_prims);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 22, sizeof(cl_mem),
&clt_db_regions);
+ error |= clSetKernelArg(clt_shade_segs_kernel, 23, sizeof(cl_mem),
&ppartitions);
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);
Modified: brlcad/trunk/src/librt/primitives/rt.cl
===================================================================
--- brlcad/trunk/src/librt/primitives/rt.cl 2017-08-27 17:11:22 UTC (rev
70136)
+++ brlcad/trunk/src/librt/primitives/rt.cl 2017-08-27 20:46:40 UTC (rev
70137)
@@ -594,16 +594,15 @@
}
__kernel void
-shade_segs(global uchar *pixels, const uchar3 o, RESULT_TYPE segs, global uint
*h,
+shade_segs(global uchar *pixels, const uchar3 o, RESULT_TYPE segs, global uint
*head_partition,
const int cur_pixel, const int last_pixel, const int width,
global float *rand_halftab, const uint randhalftabsize,
const uchar3 background, const uchar3 nonbackground,
const double airdensity, const double3 haze, const double gamma,
const double16 view2model, const double cell_width, const double
cell_height,
- 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
*head_partition)
+ const double aspect, const int lightmodel, global uchar *ids,
+ global uint *indexes, global uchar *prims, global struct region
*regions,
+ global struct partition *partitions)
{
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
