Tamito Kajiyama
800f86c845
A crash in the Freestyle renderer was reported by Ton on IRC with a stack trace below. Note that #2 is in Freestyle, whereas #1 is in the compositor. The problem was observed in a debug build on OS X 10.7 (gcc 4.2, openmp disabled, no llvm). ---------------------------------------------------------------------- Program received signal EXC_BAD_ACCESS, Could not access memory. Reason: 13 at address: 0x0000000000000000 [Switching to process 72386 thread 0xf303] 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43 43 delete (this->m_outputsockets.back()); Current language: auto; currently c++ (gdb) where #0 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43 #1 0x0000000100c29066 in Node::~Node (this=0x10e501c80) at COM_Node.h:49 #2 0x000000010089c273 in NodeShape::~NodeShape (this=0x10e501c80) at NodeShape.cpp:43 #3 0x000000010089910b in NodeGroup::destroy (this=0x10e501da0) at NodeGroup.cpp:61 #4 0x00000001008990cd in NodeGroup::destroy (this=0x10e5014b0) at NodeGroup.cpp:59 #5 0x00000001008990cd in NodeGroup::destroy (this=0x114e18da0) at NodeGroup.cpp:59 #6 0x00000001007e6602 in Controller::ClearRootNode (this=0x114e19640) at Controller.cpp:329 #7 0x00000001007ea52e in Controller::LoadMesh (this=0x114e19640, re=0x10aba4638, srl=0x1140f5258) at Controller.cpp:302 #8 0x00000001008030ad in prepare (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:302 #9 0x000000010080457a in FRS_do_stroke_rendering (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:600 #10 0x00000001006aeb9d in add_freestyle (re=0x10aba4638) at pipeline.c:1584 #11 0x00000001006aceb7 in do_render_3d (re=0x10aba4638) at pipeline.c:1094 #12 0x00000001006ae061 in do_render_fields_blur_3d (re=0x10aba4638) at pipeline.c:1367 #13 0x00000001006afa16 in do_render_composite_fields_blur_3d (re=0x10aba4638) at pipeline.c:1815 #14 0x00000001006b04e4 in do_render_all_options (re=0x10aba4638) at pipeline.c:2021 ---------------------------------------------------------------------- Apparently a name conflict between the two Blender modules is taking place. The present commit hence intends to address it by putting all the Freestyle C++ classes in the namespace 'Freestyle'. This revision will also prevent potential name conflicts with other Blender modules in the future. Special thanks to Lukas Toenne for the help with C++ namespace.
136 lines
3.5 KiB
C++
136 lines
3.5 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file blender/freestyle/intern/system/RandGen.cpp
|
|
* \ingroup freestyle
|
|
* \brief Pseudo-random number generator
|
|
* \author Fredo Durand
|
|
* \date 20/05/2003
|
|
*/
|
|
|
|
#include "RandGen.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
//
|
|
// Macro definitions
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#define N 16
|
|
#define MASK ((unsigned)(1 << (N - 1)) + (1 << (N - 1)) - 1)
|
|
#define X0 0x330E
|
|
#define X1 0xABCD
|
|
#define X2 0x1234
|
|
#define A0 0xE66D
|
|
#define A1 0xDEEC
|
|
#define A2 0x5
|
|
#define C 0xB
|
|
#if 0 // XXX Unused
|
|
#define HI_BIT (1L << (2 * N - 1))
|
|
#endif
|
|
|
|
#define LOW(x) ((unsigned)(x) & MASK)
|
|
#define HIGH(x) LOW((x) >> N)
|
|
|
|
#define MUL(x, y, z) \
|
|
{ \
|
|
long l = (long)(x) * (long)(y); \
|
|
(z)[0] = LOW(l); \
|
|
(z)[1] = HIGH(l); \
|
|
}
|
|
|
|
#define CARRY(x, y) ((unsigned long)((long)(x) + (long)(y)) > MASK)
|
|
#define ADDEQU(x, y, z) (z = CARRY(x, (y)), x = LOW(x + (y)))
|
|
#define SET3(x, x0, x1, x2) ((x)[0] = (x0), (x)[1] = (x1), (x)[2] = (x2))
|
|
#if 0 // XXX, unused
|
|
#define SETLOW(x, y, n) SET3(x, LOW((y)[n]), LOW((y)[(n)+1]), LOW((y)[(n)+2]))
|
|
#endif
|
|
#define SEED(x0, x1, x2) (SET3(x, x0, x1, x2), SET3(a, A0, A1, A2), c = C)
|
|
|
|
#if 0 // XXX, unused
|
|
#define REST(v) \
|
|
for (i = 0; i < 3; i++) { \
|
|
xsubi[i] = x[i]; \
|
|
x[i] = temp[i]; \
|
|
} \
|
|
return (v); \
|
|
(void) 0
|
|
|
|
#define NEST(TYPE, f, F) \
|
|
TYPE f(register unsigned short *xsubi) { \
|
|
register int i; \
|
|
register TYPE v; \
|
|
unsigned temp[3]; \
|
|
for (i = 0; i < 3; i++) { \
|
|
temp[i] = x[i]; \
|
|
x[i] = LOW(xsubi[i]); \
|
|
} \
|
|
v = F(); \
|
|
REST(v); \
|
|
}
|
|
#endif
|
|
|
|
static unsigned x[3] = {
|
|
X0,
|
|
X1,
|
|
X2
|
|
};
|
|
static unsigned a[3] = {
|
|
A0,
|
|
A1,
|
|
A2
|
|
};
|
|
static unsigned c = C;
|
|
|
|
//
|
|
// Methods implementation
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
real RandGen::drand48()
|
|
{
|
|
static real two16m = 1.0 / (1L << N);
|
|
next();
|
|
return (two16m * (two16m * (two16m * x[0] + x[1]) + x[2]));
|
|
}
|
|
|
|
void RandGen::srand48(long seedval)
|
|
{
|
|
SEED(X0, LOW(seedval), HIGH(seedval));
|
|
}
|
|
|
|
void RandGen::next()
|
|
{
|
|
unsigned p[2], q[2], r[2], carry0, carry1;
|
|
|
|
MUL(a[0], x[0], p);
|
|
ADDEQU(p[0], c, carry0);
|
|
ADDEQU(p[1], carry0, carry1);
|
|
MUL(a[0], x[1], q);
|
|
ADDEQU(p[1], q[0], carry0);
|
|
MUL(a[1], x[0], r);
|
|
x[2] = LOW(carry0 + carry1 + CARRY(p[1], r[0]) + q[1] + r[1] + a[0] * x[2] + a[1] * x[1] + a[2] * x[0]);
|
|
x[1] = LOW(p[1] + r[0]);
|
|
x[0] = LOW(p[0]);
|
|
}
|
|
|
|
} /* namespace Freestyle */
|