[Bf-blender-cvs] [f21f18b572e] master: Task scheduler: Use const qualifier in callbacks for parallel range

Sergey Sharybin noreply at git.blender.org
Wed Jan 10 13:21:02 CET 2018


Commit: f21f18b572e4fa025516995ddfa6a7c04bdb5907
Author: Sergey Sharybin
Date:   Wed Jan 10 12:53:59 2018 +0100
Branches: master
https://developer.blender.org/rBf21f18b572e4fa025516995ddfa6a7c04bdb5907

Task scheduler: Use const qualifier in callbacks for parallel range

===================================================================

M	source/blender/blenkernel/intern/CCGSubSurf_legacy.c
M	source/blender/blenkernel/intern/mask_rasterize.c
M	source/blender/blenkernel/intern/tracking_auto.c
M	source/blender/blenkernel/intern/tracking_stabilize.c
M	source/blender/bmesh/intern/bmesh_interp.c
M	source/blender/depsgraph/intern/eval/deg_eval.cc
M	source/blender/depsgraph/intern/eval/deg_eval_flush.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
index d289f63dac1..d567b50af56 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
@@ -138,7 +138,7 @@ typedef struct CCGSubSurfCalcSubdivData {
 
 static void ccgSubSurf__calcVertNormals_faces_accumulate_cb(
         void *__restrict userdata,
-        int ptrIdx,
+        const int ptrIdx,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	CCGSubSurfCalcSubdivData *data = userdata;
@@ -232,7 +232,7 @@ static void ccgSubSurf__calcVertNormals_faces_accumulate_cb(
 
 static void ccgSubSurf__calcVertNormals_faces_finalize_cb(
         void *__restrict userdata,
-        int ptrIdx,
+        const int ptrIdx,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	CCGSubSurfCalcSubdivData *data = userdata;
@@ -273,7 +273,7 @@ static void ccgSubSurf__calcVertNormals_faces_finalize_cb(
 
 static void ccgSubSurf__calcVertNormals_edges_accumulate_cb(
         void *__restrict userdata,
-        int ptrIdx,
+        const int ptrIdx,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	CCGSubSurfCalcSubdivData *data = userdata;
@@ -422,7 +422,7 @@ static void ccgSubSurf__calcVertNormals(CCGSubSurf *ss,
 
 static void ccgSubSurf__calcSubdivLevel_interior_faces_edges_midpoints_cb(
         void *__restrict userdata,
-        int ptrIdx,
+        const int ptrIdx,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	CCGSubSurfCalcSubdivData *data = userdata;
@@ -512,7 +512,7 @@ static void ccgSubSurf__calcSubdivLevel_interior_faces_edges_midpoints_cb(
 
 static void ccgSubSurf__calcSubdivLevel_interior_faces_edges_centerpoints_shift_cb(
         void *__restrict userdata,
-        int ptrIdx,
+        const int ptrIdx,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	CCGSubSurfCalcSubdivData *data = userdata;
@@ -620,7 +620,7 @@ static void ccgSubSurf__calcSubdivLevel_interior_faces_edges_centerpoints_shift_
 
 static void ccgSubSurf__calcSubdivLevel_verts_copydata_cb(
         void *__restrict userdata,
-        int ptrIdx,
+        const int ptrIdx,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	CCGSubSurfCalcSubdivData *data = userdata;
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index 093a1967ae8..76d16334630 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -1436,7 +1436,7 @@ typedef struct MaskRasterizeBufferData {
 
 static void maskrasterize_buffer_cb(
         void *__restrict userdata,
-        int y,
+        const int y,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	MaskRasterizeBufferData *data = userdata;
diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c
index d297a92f29e..1cb474e6202 100644
--- a/source/blender/blenkernel/intern/tracking_auto.c
+++ b/source/blender/blenkernel/intern/tracking_auto.c
@@ -434,7 +434,7 @@ AutoTrackContext *BKE_autotrack_context_new(MovieClip *clip,
 
 static void autotrack_context_step_cb(
         void *__restrict userdata,
-        int track,
+        const int track,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	AutoTrackContext *context = userdata;
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c
index bd83c2eb6dc..cbf1a02a46c 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.c
+++ b/source/blender/blenkernel/intern/tracking_stabilize.c
@@ -1505,7 +1505,7 @@ typedef struct TrackingStabilizeFrameInterpolationData {
 
 static void tracking_stabilize_frame_interpolation_cb(
         void *__restrict userdata,
-        int j,
+        const int j,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	TrackingStabilizeFrameInterpolationData *data = userdata;
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index a701d4de05b..8a1090891f2 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -421,7 +421,7 @@ typedef struct BMLoopInterpMultiresData {
 
 static void loop_interp_multires_cb(
         void *__restrict userdata,
-        int ix,
+        const int ix,
         const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	BMLoopInterpMultiresData *data = userdata;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index d8d4906a71a..76e76b5eb7b 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -109,7 +109,7 @@ typedef struct CalculatePengindData {
 
 static void calculate_pending_func(
         void *__restrict data_v,
-        int i,
+        const int i,
         const ParallelRangeTLS *__restrict /*tls*/)
 {
 	CalculatePengindData *data = (CalculatePengindData *)data_v;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index de4c60bc193..9e910afea07 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -85,7 +85,7 @@ void lib_id_recalc_data_tag(Main *bmain, ID *id)
 
 void flush_init_operation_node_func(
         void *__restrict data_v,
-        int i,
+        const int i,
         const ParallelRangeTLS *__restrict /*tls*/)
 {
 	Depsgraph *graph = (Depsgraph *)data_v;
@@ -95,7 +95,7 @@ void flush_init_operation_node_func(
 
 void flush_init_id_node_func(
         void *__restrict data_v,
-        int i,
+        const int i,
         const ParallelRangeTLS *__restrict /*tls*/)
 {
 	Depsgraph *graph = (Depsgraph *)data_v;
@@ -297,7 +297,7 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 
 static void graph_clear_func(
         void *__restrict data_v,
-        int i,
+        const int i,
         const ParallelRangeTLS *__restrict /*tls*/)
 {
 	Depsgraph *graph = (Depsgraph *)data_v;



More information about the Bf-blender-cvs mailing list