Revision: 70057 http://sourceforge.net/p/brlcad/code/70057 Author: mdtwenty Date: 2017-08-08 13:19:21 +0000 (Tue, 08 Aug 2017) Log Message: ----------- Removed next_evalpp field from cl_partition struct
Modified Paths: -------------- brlcad/branches/opencl/include/rt/shoot.h brlcad/branches/opencl/src/librt/primitives/bool.cl brlcad/branches/opencl/src/librt/primitives/common.cl brlcad/branches/opencl/src/librt/primitives/rt.cl Modified: brlcad/branches/opencl/include/rt/shoot.h =================================================================== --- brlcad/branches/opencl/include/rt/shoot.h 2017-08-07 18:22:25 UTC (rev 70056) +++ brlcad/branches/opencl/include/rt/shoot.h 2017-08-08 13:19:21 UTC (rev 70057) @@ -183,7 +183,6 @@ cl_uint outseg; cl_uint forw_pp; /* index to the next partition */ cl_uint back_pp; /* index to the previous partition */ - cl_uint next_evalpp; /* index to the next evaluated partition */ cl_uint region_id; /* id of the "owning" region */ cl_char inflip; /* flip inhit->hit_normal */ cl_char outflip; /* flip outhit->hit_normal */ Modified: brlcad/branches/opencl/src/librt/primitives/bool.cl =================================================================== --- brlcad/branches/opencl/src/librt/primitives/bool.cl 2017-08-07 18:22:25 UTC (rev 70056) +++ brlcad/branches/opencl/src/librt/primitives/bool.cl 2017-08-08 13:19:21 UTC (rev 70057) @@ -114,7 +114,6 @@ if (pp_idx != UINT_MAX) { partitions[pp_idx].inflip = 0; partitions[pp_idx].outflip = 0; - partitions[pp_idx].next_evalpp = UINT_MAX; partitions[pp_idx].region_id = UINT_MAX; } } @@ -956,7 +955,7 @@ if (lastpp_eval_idx != UINT_MAX) { /* there is one last partition evaluated for this ray */ lastpp = &partitions[lastpp_eval_idx]; - lastpp->next_evalpp = current_index; + lastpp->forw_pp = current_index; } if (lastpp_eval_idx != UINT_MAX && lastregion_idx == lastpp->region_id && Modified: brlcad/branches/opencl/src/librt/primitives/common.cl =================================================================== --- brlcad/branches/opencl/src/librt/primitives/common.cl 2017-08-07 18:22:25 UTC (rev 70056) +++ brlcad/branches/opencl/src/librt/primitives/common.cl 2017-08-08 13:19:21 UTC (rev 70057) @@ -69,7 +69,6 @@ uint outseg; uint forw_pp; /* index to the next partition */ uint back_pp; /* index to the previous partition */ - uint next_evalpp; /* index to the next evaluated partition */ uint region_id; /* id of the "owning" region */ char inflip; /* flip inhit->hit_normal */ char outflip; /* flip outhit->hit_normal */ Modified: brlcad/branches/opencl/src/librt/primitives/rt.cl =================================================================== --- brlcad/branches/opencl/src/librt/primitives/rt.cl 2017-08-07 18:22:25 UTC (rev 70056) +++ brlcad/branches/opencl/src/librt/primitives/rt.cl 2017-08-08 13:19:21 UTC (rev 70057) @@ -640,7 +640,7 @@ /* Get first partition of the ray */ head = head_partition[id]; flipflag = 0; - for (uint index = head; index != UINT_MAX; index = partitions[index].next_evalpp) { + for (uint index = head; index != UINT_MAX; index = partitions[index].forw_pp) { global struct partition *pp = &partitions[index]; RESULT_TYPE segp = &segs[pp->inseg]; 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