[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34258] branches/particles-2010/source/ blender: Small cleanup: Moved SimExecData and SimNodeOperator structs to SIM_intern.h, since these are only used by node tree execution functions internally.
Lukas Toenne
lukas.toenne at googlemail.com
Tue Jan 11 13:44:46 CET 2011
Revision: 34258
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34258
Author: lukastoenne
Date: 2011-01-11 12:44:45 +0000 (Tue, 11 Jan 2011)
Log Message:
-----------
Small cleanup: Moved SimExecData and SimNodeOperator structs to SIM_intern.h, since these are only used by node tree execution functions internally. Fixed a minor RNA bug (collection lookup callbacks were changed).
Modified Paths:
--------------
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/nodes/intern/SIM_intern.h
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_add_particle.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_constant.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_create_mesh_point.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_curve.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for_group.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_data.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_mesh_data.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_if.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_index.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_math.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_math_rotation.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_math_vector.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_particle_dynamics.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_pass.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_program.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_random.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_set_data.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_subprogram.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_timestep.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_while.c
branches/particles-2010/source/blender/nodes/intern/SIM_util.h
Modified: branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -651,18 +651,13 @@
return 1;
}
-static PointerRNA rna_Node_data_valid_types_lookupstring(PointerRNA *ptr, const char *str)
+static int rna_Node_data_valid_types_lookupstring(PointerRNA *ptr, const char *str, PointerRNA *r_ptr)
{
- PointerRNA value;
-
- RNA_pointer_create(NULL, NULL, NULL, &value);
- return value;
-
+ RNA_pointer_create(NULL, NULL, NULL, r_ptr);
// ParticleSet *pset= (ParticleSet*)ptr->data;
-// PointerRNA value;
//
-// RNA_pointer_create(&pset->id, &RNA_NParticle, pset_get_particle(pset, i), &value);
-// return value;
+// RNA_pointer_create(&pset->id, &RNA_NParticle, pset_get_particle(pset, i), r_ptr);
+ return 1;
}
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_intern.h
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_intern.h 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_intern.h 2011-01-11 12:44:45 UTC (rev 34258)
@@ -58,8 +58,44 @@
#include "SIM_util.h"
+typedef struct SimNodeOperator {
+ struct SimNodeOperator *next, *prev;
+ struct SimNodeStack *node;
+ int exec; /* execution level on resume */
+ SimDataContext self;
+} SimNodeOperator;
-struct SimExecData;
+typedef struct SimExecData {
+ int totnode, totin, totout;
+ struct SimNodeStack *nodestack;
+ struct SimSocketStack **instack;
+ struct SimSocketStack *outstack;
+ ListBase opstack;
+ SimNodeOperator *curop;
+
+ struct SimWorkerThread *threads;
+ ListBase thread_list;
+ int totthreads, active;
+ short stop;
+ pthread_mutex_t hostmutex;
+ pthread_cond_t hostcond;
+ pthread_cond_t workercond;
+
+ ListBase queue;
+ int default_workgroupsize;
+
+ short error;
+ char error_string[256];
+
+ struct SimContext *simctx;
+
+ #ifdef WITH_OPENCL
+ cl_context opencl_context;
+ cl_device_id opencl_device;
+ cl_command_queue opencl_queue;
+ cl_program *opencl_program;
+ #endif
+} SimExecData;
typedef struct SimWorkerThread {
struct SimExecData *execdata;
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_add_particle.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_add_particle.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_add_particle.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -52,7 +52,7 @@
sim_data_init_node(node, 0, &RNA_ParticleSet);
}
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int exec)
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int exec)
{
if (exec == 0) {
SimDataContext ctx;
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_constant.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_constant.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_constant.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -104,7 +104,7 @@
}
}
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *UNUSED(self), int UNUSED(exec))
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *UNUSED(self), int UNUSED(exec))
{
SimNodeConstant *data= (SimNodeConstant*)node->base->storage;
SimSocketIterator sockiter;
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_create_mesh_point.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_create_mesh_point.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_create_mesh_point.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -104,7 +104,7 @@
*SIM_OUTPUT_MESHPT(0, global_id) = meshpt;
}
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int UNUSED(exec))
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int UNUSED(exec))
{
ExecStorage *storage= (ExecStorage*)node->storage;
SimDataContext ctx;
@@ -118,7 +118,7 @@
if (sim_data_resolve_context(self->simctx, node->base, self, &ctx)) {
Object *ob= (Object*)sim_context_data(&ctx);
DerivedMesh *dm;
- SimKernel *kernel;
+ struct SimKernel *kernel;
/* get the derived mesh and make a copy */
dm = mesh_get_derived_final(ctx.simctx->scene, ob, CD_MASK_MFACE | CD_MASK_ORCO);
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_curve.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_curve.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_curve.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -50,7 +50,7 @@
*SIM_OUTPUT_FLOAT(0, global_id) = curvemapping_evaluateF(node->base->storage, 0, x);
}
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *UNUSED(self), int UNUSED(exec))
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *UNUSED(self), int UNUSED(exec))
{
SimKernel *kernel;
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -57,7 +57,7 @@
MEM_freeN(storage);
}
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *UNUSED(self), int exec)
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *UNUSED(self), int exec)
{
OpStorage *storage= (OpStorage*)node->storage;
SimSocketIterator sockiter;
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for_group.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for_group.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for_group.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -66,7 +66,7 @@
MEM_freeN(storage);
}
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int exec)
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int exec)
{
ForGroupStorage *storage = (ForGroupStorage*)node->storage;
SimDataContext ctx;
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_data.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_data.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_data.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -65,7 +65,7 @@
}
#if 0
-static void write_property_collection(SimExecData *execdata, SimSocketStack *out, SimDataContext *ctx)
+static void write_property_collection(struct SimExecData *execdata, SimSocketStack *out, SimDataContext *ctx)
{
SimDataNodeSocket *data= (SimDataNodeSocket*)out->base->storage;
SimSocketIterator sockiter;
@@ -123,7 +123,7 @@
sim_output_end(execdata, &sockiter);
}
-static void write_property_singleton(SimExecData *execdata, SimSocketStack *out, SimDataContext *ctx)
+static void write_property_singleton(struct SimExecData *execdata, SimSocketStack *out, SimDataContext *ctx)
{
SimDataNodeSocket *data= (SimDataNodeSocket*)out->base->storage;
SimSocketIterator sockiter;
@@ -170,7 +170,7 @@
sim_property_read(prop, global_id, data);
}
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int UNUSED(exec))
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int UNUSED(exec))
{
bNodeSocket *sock;
int i;
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_mesh_data.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_mesh_data.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_mesh_data.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -259,7 +259,7 @@
}
#endif
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int UNUSED(exec))
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *self, int UNUSED(exec))
{
ExecStorage *storage= (ExecStorage*)node->storage;
SimDataContext ctx;
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_if.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_if.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_if.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -208,7 +208,7 @@
strcpy(SIM_OUTPUT_STRING(0, global_id), res);
}
-static int enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *UNUSED(self), int UNUSED(exec))
+static int enqueue(struct SimExecData *execdata, SimNodeStack *node, SimDataContext *UNUSED(self), int UNUSED(exec))
{
int type= node->outstack[0].type;
if (type==SOCK_OP) {
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_index.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_index.c 2011-01-11 12:36:49 UTC (rev 34257)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_index.c 2011-01-11 12:44:45 UTC (rev 34258)
@@ -42,7 +42,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list