[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48574] trunk/blender/source/blender: Mask node: create a copy of layers to be rasterized in initExecution
Sergey Sharybin
sergey.vfx at gmail.com
Wed Jul 4 09:10:24 CEST 2012
Revision: 48574
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48574
Author: nazgul
Date: 2012-07-04 07:10:23 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Mask node: create a copy of layers to be rasterized in initExecution
This creates a list of splines to be rasterized in nitExecution which
is being called from main thread. This should resolve possible threading
issues discovered in tomato branch.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_mask.h
trunk/blender/source/blender/blenkernel/intern/mask.c
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h
Modified: trunk/blender/source/blender/blenkernel/BKE_mask.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mask.h 2012-07-03 23:59:49 UTC (rev 48573)
+++ trunk/blender/source/blender/blenkernel/BKE_mask.h 2012-07-04 07:10:23 UTC (rev 48574)
@@ -27,6 +27,7 @@
#ifndef __BKE_MASK_H__
#define __BKE_MASK_H__
+struct ListBase;
struct Main;
struct Mask;
struct MaskParent;
@@ -50,12 +51,16 @@
void BKE_mask_layer_free_shapes(struct MaskLayer *masklay);
void BKE_mask_layer_free(struct MaskLayer *masklay);
+void BKE_mask_layer_free_list(struct ListBase *masklayers);
void BKE_mask_spline_free(struct MaskSpline *spline);
struct MaskSpline *BKE_mask_spline_copy(struct MaskSpline *spline);
void BKE_mask_point_free(struct MaskSplinePoint *point);
void BKE_mask_layer_unique_name(struct Mask *mask, struct MaskLayer *masklay);
+struct MaskLayer *BKE_mask_layer_copy(struct MaskLayer *layer);
+void BKE_mask_layer_copy_list(struct ListBase *masklayers_new, struct ListBase *masklayers);
+
/* splines */
struct MaskSpline *BKE_mask_spline_add(struct MaskLayer *masklay);
@@ -170,6 +175,11 @@
/* rasterization */
int BKE_mask_get_duration(struct Mask *mask);
+
+void BKE_mask_rasterize_layers(struct ListBase *masklayers, int width, int height, float *buffer,
+ const short do_aspect_correct, const short do_mask_aa,
+ const short do_feather);
+
void BKE_mask_rasterize(struct Mask *mask, int width, int height, float *buffer,
const short do_aspect_correct, const short do_mask_aa,
const short do_feather);
Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c 2012-07-03 23:59:49 UTC (rev 48573)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c 2012-07-04 07:10:23 UTC (rev 48574)
@@ -188,6 +188,41 @@
BLI_uniquename(&mask->masklayers, masklay, "MaskLayer", '.', offsetof(MaskLayer, name), sizeof(masklay->name));
}
+MaskLayer *BKE_mask_layer_copy(MaskLayer *layer)
+{
+ MaskLayer *layer_new;
+ MaskSpline *spline;
+
+ layer_new = MEM_callocN(sizeof(MaskLayer), "new mask layer");
+
+ BLI_strncpy(layer_new->name, layer->name, sizeof(layer_new->name));
+
+ layer_new->alpha = layer->alpha;
+ layer_new->blend = layer->blend;
+ layer_new->blend_flag = layer->blend_flag;
+ layer_new->flag = layer->flag;
+ layer_new->restrictflag = layer->restrictflag;
+
+ for (spline = layer->splines.first; spline; spline = spline->next) {
+ MaskSpline *spline_new = BKE_mask_spline_copy(spline);
+
+ BLI_addtail(&layer_new->splines, spline_new);
+ }
+
+ return layer_new;
+}
+
+void BKE_mask_layer_copy_list(ListBase *masklayers_new, ListBase *masklayers)
+{
+ MaskLayer *layer;
+
+ for (layer = masklayers->first; layer; layer = layer->next) {
+ MaskLayer *layer_new = BKE_mask_layer_copy(layer);
+
+ BLI_addtail(masklayers_new, layer_new);
+ }
+}
+
/* splines */
MaskSpline *BKE_mask_spline_add(MaskLayer *masklay)
@@ -988,21 +1023,34 @@
MEM_freeN(spline);
}
+static MaskSplinePoint *mask_spline_points_copy(MaskSplinePoint *points, int tot_point)
+{
+ MaskSplinePoint *npoints;
+ int i;
+
+ npoints = MEM_dupallocN(points);
+
+ for (i = 0; i < tot_point; i++) {
+ MaskSplinePoint *point = &npoints[i];
+
+ if (point->uw)
+ point->uw = MEM_dupallocN(point->uw);
+ }
+
+ return npoints;
+}
+
MaskSpline *BKE_mask_spline_copy(MaskSpline *spline)
{
MaskSpline *nspline = MEM_callocN(sizeof(MaskSpline), "new spline");
- int i;
*nspline = *spline;
nspline->points_deform = NULL;
- nspline->points = MEM_dupallocN(nspline->points);
+ nspline->points = mask_spline_points_copy(spline->points, spline->tot_point);
- for (i = 0; i < nspline->tot_point; i++) {
- MaskSplinePoint *point = &nspline->points[i];
-
- if (point->uw)
- point->uw = MEM_dupallocN(point->uw);
+ if (spline->points_deform) {
+ nspline->points_deform = mask_spline_points_copy(spline->points_deform, spline->tot_point);
}
return nspline;
@@ -1068,20 +1116,25 @@
MEM_freeN(masklay);
}
-void BKE_mask_free(Mask *mask)
+void BKE_mask_layer_free_list(ListBase *masklayers)
{
- MaskLayer *masklay = mask->masklayers.first;
+ MaskLayer *masklay = masklayers->first;
while (masklay) {
- MaskLayer *next_masklay = masklay->next;
+ MaskLayer *masklay_next = masklay->next;
- BLI_remlink(&mask->masklayers, masklay);
+ BLI_remlink(masklayers, masklay);
BKE_mask_layer_free(masklay);
- masklay = next_masklay;
+ masklay = masklay_next;
}
}
+void BKE_mask_free(Mask *mask)
+{
+ BKE_mask_layer_free_list(&mask->masklayers);
+}
+
void BKE_mask_unlink(Main *bmain, Mask *mask)
{
bScreen *scr;
@@ -2093,9 +2146,9 @@
}
/* rasterization */
-void BKE_mask_rasterize(Mask *mask, int width, int height, float *buffer,
- const short do_aspect_correct, const short do_mask_aa,
- const short do_feather)
+void BKE_mask_rasterize_layers(ListBase *masklayers, int width, int height, float *buffer,
+ const short do_aspect_correct, const short do_mask_aa,
+ const short do_feather)
{
MaskLayer *masklay;
@@ -2103,7 +2156,7 @@
const int buffer_size = width * height;
float *buffer_tmp = MEM_mallocN(sizeof(float) * buffer_size, __func__);
- for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+ for (masklay = masklayers->first; masklay; masklay = masklay->next) {
MaskSpline *spline;
float alpha;
@@ -2226,3 +2279,10 @@
MEM_freeN(buffer_tmp);
}
+
+void BKE_mask_rasterize(Mask *mask, int width, int height, float *buffer,
+ const short do_aspect_correct, const short do_mask_aa,
+ const short do_feather)
+{
+ BKE_mask_rasterize_layers(&mask->masklayers, width, height, buffer, do_aspect_correct, do_mask_aa, do_feather);
+}
Modified: trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp 2012-07-03 23:59:49 UTC (rev 48573)
+++ trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp 2012-07-04 07:10:23 UTC (rev 48574)
@@ -49,11 +49,19 @@
void MaskOperation::initExecution()
{
initMutex();
+
this->m_rasterizedMask = NULL;
+ this->m_maskLayers.first = this->m_maskLayers.last = NULL;
+
+ if (this->m_mask) {
+ BKE_mask_layer_copy_list(&this->m_maskLayers, &this->m_mask->masklayers);
+ }
}
void MaskOperation::deinitExecution()
{
+ BKE_mask_layer_free_list(&this->m_maskLayers);
+
if (this->m_rasterizedMask) {
MEM_freeN(this->m_rasterizedMask);
this->m_rasterizedMask = NULL;
@@ -75,7 +83,10 @@
float *buffer;
buffer = (float *)MEM_callocN(sizeof(float) * width * height, "rasterized mask");
- BKE_mask_rasterize(this->m_mask, width, height, buffer, TRUE, this->m_do_smooth, this->m_do_feather);
+
+ BKE_mask_rasterize_layers(&this->m_maskLayers, width, height, buffer, TRUE,
+ this->m_do_smooth, this->m_do_feather);
+
if (this->m_do_smooth) {
PLX_antialias_buffer(buffer, width, height);
}
Modified: trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h 2012-07-03 23:59:49 UTC (rev 48573)
+++ trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h 2012-07-04 07:10:23 UTC (rev 48574)
@@ -43,6 +43,7 @@
bool m_do_smooth;
bool m_do_feather;
float *m_rasterizedMask;
+ ListBase m_maskLayers;
/**
* Determine the output resolution. The resolution is retrieved from the Renderer
More information about the Bf-blender-cvs
mailing list