[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32410] branches/particles-2010/source/ blender: Merged sim_kernel_set_node into the init function.
Lukas Toenne
lukas.toenne at googlemail.com
Mon Oct 11 10:19:29 CEST 2010
Revision: 32410
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32410
Author: lukastoenne
Date: 2010-10-11 10:19:28 +0200 (Mon, 11 Oct 2010)
Log Message:
-----------
Merged sim_kernel_set_node into the init function. These two are always combined, so this removes an unnecessary function call.
Modified Paths:
--------------
branches/particles-2010/source/blender/editors/particleset/particleset_edit.c
branches/particles-2010/source/blender/nodes/intern/simulation/SIM_util.c
branches/particles-2010/source/blender/nodes/intern/simulation/SIM_util.h
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_if.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_math.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_pass.c
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_vectormath.c
Modified: branches/particles-2010/source/blender/editors/particleset/particleset_edit.c
===================================================================
--- branches/particles-2010/source/blender/editors/particleset/particleset_edit.c 2010-10-11 08:03:28 UTC (rev 32409)
+++ branches/particles-2010/source/blender/editors/particleset/particleset_edit.c 2010-10-11 08:19:28 UTC (rev 32410)
@@ -154,7 +154,6 @@
static int property_add_exec(bContext *C, wmOperator *op)
{
- Scene *scene= CTX_data_scene(C);
Object *ob = ED_object_active_context(C);
ParticleSet *pset;
int type= RNA_enum_get(op->ptr, "type");
@@ -173,7 +172,6 @@
static EnumPropertyItem *property_add_itemf(bContext *C, PointerRNA *ptr, int *free)
{
- Object *ob= ED_object_active_context(C);
EnumPropertyItem *item= NULL;
EnumPropertyItem tmp = {0, "", 0, "", ""};
ParticlePropertyInfo *propinfo;
@@ -223,7 +221,6 @@
/* ================= property_remove ================= */
static int property_remove_exec(bContext *C, wmOperator *op)
{
- Scene *scene= CTX_data_scene(C);
Object *ob = ED_object_active_context(C);
ParticleSet *pset;
int index = RNA_int_get(op->ptr, "index");
@@ -273,7 +270,6 @@
/* ================= property_moveup ================= */
static int property_moveup_exec(bContext *C, wmOperator *op)
{
- Scene *scene= CTX_data_scene(C);
Object *ob = ED_object_active_context(C);
ParticleSet *pset;
int index = RNA_int_get(op->ptr, "index");
@@ -323,7 +319,6 @@
/* ================= property_movedown ================= */
static int property_movedown_exec(bContext *C, wmOperator *op)
{
- Scene *scene= CTX_data_scene(C);
Object *ob = ED_object_active_context(C);
ParticleSet *pset;
int index = RNA_int_get(op->ptr, "index");
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/SIM_util.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/SIM_util.c 2010-10-11 08:03:28 UTC (rev 32409)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/SIM_util.c 2010-10-11 08:19:28 UTC (rev 32410)
@@ -851,71 +851,24 @@
}
}
-void sim_kernel_init(SimExecData *execdata, SimKernel *kernel, SimKernelFunction func, const char *cl_funcname)
+void sim_kernel_init(SimExecData *execdata, SimKernel *kernel, SimNodeStack *node, SimKernelFunction func, const char *cl_funcname, int num_args)
{
if (execdata->error)
return;
+ kernel->node = node;
+
#ifdef WITH_OPENCL
if (BKE_opencl_is_active()) {
cl_int res;
+ int i, arg_index;
kernel->impl_cl = clCreateKernel(*execdata->opencl_program, cl_funcname, &res);
if (res != CL_SUCCESS) {
execdata->error = 1;
sprintf(execdata->error_string, "Error creating OpenCL kernel: %s", BKE_opencl_message(res));
}
- }
- else
-#endif
- {
- int i;
- kernel->impl = func;
- for (i=0; i < SIM_MAXKERNELARGS; ++i) {
- kernel->args[i] = NULL;
- }
- }
-}
-
-void sim_kernel_release(SimExecData *execdata, SimKernel *kernel)
-{
- if (execdata->error)
- return;
-
-#ifdef WITH_OPENCL
- if (BKE_opencl_is_active()) {
- cl_int res = clReleaseKernel(kernel->impl_cl);
- if (res != CL_SUCCESS) {
- execdata->error = 1;
- sprintf(execdata->error_string, "Error releasing OpenCL kernel: %s", BKE_opencl_message(res));
- }
- }
- else
-#endif
- {
- int i;
-
- for (i=0; i < SIM_MAXKERNELARGS; ++i) {
- if (kernel->args[i]) {
- MEM_freeN(kernel->args[i]);
- kernel->args[i] = NULL;
- }
- }
- }
-}
-
-void sim_kernel_set_node(SimExecData *execdata, SimKernel *kernel, SimNodeStack *node, int num_args)
-{
- if (execdata->error)
- return;
-
- kernel->node = node;
-
-#ifdef WITH_OPENCL
- if (BKE_opencl_is_active()) {
- int i, arg_index;
- cl_int res;
/* Append socket buffer arguments after custom arguments.
* This includes the buffer data pointer as well as the context size (number of elements).
*/
@@ -957,9 +910,42 @@
else
#endif
{
+ int i;
+
+ kernel->impl = func;
+ for (i=0; i < SIM_MAXKERNELARGS; ++i) {
+ kernel->args[i] = NULL;
+ }
}
}
+void sim_kernel_release(SimExecData *execdata, SimKernel *kernel)
+{
+ if (execdata->error)
+ return;
+
+#ifdef WITH_OPENCL
+ if (BKE_opencl_is_active()) {
+ cl_int res = clReleaseKernel(kernel->impl_cl);
+ if (res != CL_SUCCESS) {
+ execdata->error = 1;
+ sprintf(execdata->error_string, "Error releasing OpenCL kernel: %s", BKE_opencl_message(res));
+ }
+ }
+ else
+#endif
+ {
+ int i;
+
+ for (i=0; i < SIM_MAXKERNELARGS; ++i) {
+ if (kernel->args[i]) {
+ MEM_freeN(kernel->args[i]);
+ kernel->args[i] = NULL;
+ }
+ }
+ }
+}
+
void sim_kernel_set_arg(SimExecData *execdata, SimKernel *kernel, int arg_index, size_t arg_size, const void *arg_value)
{
if (execdata->error)
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/SIM_util.h
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/SIM_util.h 2010-10-11 08:03:28 UTC (rev 32409)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/SIM_util.h 2010-10-11 08:19:28 UTC (rev 32410)
@@ -239,9 +239,8 @@
void sim_node_init_default_data(struct SimExecData *execdata, struct SimSocketStack *input, struct SimDataContext *ctx);
void sim_node_free_default_data(struct SimExecData *execdata, struct SimSocketStack *input);
-void sim_kernel_init(struct SimExecData *execdata, struct SimKernel *kernel, SimKernelFunction func, const char *cl_funcname);
+void sim_kernel_init(struct SimExecData *execdata, struct SimKernel *kernel, struct SimNodeStack *node, SimKernelFunction func, const char *cl_funcname, int num_args);
void sim_kernel_release(struct SimExecData *execdata, struct SimKernel *kernel);
-void sim_kernel_set_node(struct SimExecData *execdata, struct SimKernel *kernel, struct SimNodeStack *node, int num_args);
void sim_kernel_set_arg(struct SimExecData *execdata, struct SimKernel *kernel, int arg_index, size_t arg_size, const void *arg_value);
void sim_kernel_enqueue(struct SimExecData *execdata, struct SimKernel *kernel, size_t total, struct ListBase *wait_events, struct ListBase *event_list);
void sim_task_enqueue(struct SimExecData *execdata, struct SimKernel *kernel, struct ListBase *wait_events, struct ListBase *event_list);
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_if.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_if.c 2010-10-11 08:03:28 UTC (rev 32409)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_if.c 2010-10-11 08:19:28 UTC (rev 32410)
@@ -95,8 +95,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
- sim_kernel_init(execdata, kernel, kernelfunc, kernelname);
- sim_kernel_set_node(execdata, kernel, node, 0);
+ sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
sim_kernel_enqueue(execdata, kernel, ctx.size, &node->inputevents, &node->events);
}
}
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_math.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_math.c 2010-10-11 08:03:28 UTC (rev 32409)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_math.c 2010-10-11 08:19:28 UTC (rev 32410)
@@ -140,8 +140,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
- sim_kernel_init(execdata, kernel, kernelfunc, kernelname);
- sim_kernel_set_node(execdata, kernel, node, 0);
+ sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
}
@@ -208,8 +207,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
- sim_kernel_init(execdata, kernel, kernelfunc, kernelname);
- sim_kernel_set_node(execdata, kernel, node, 0);
+ sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
}
@@ -276,8 +274,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
- sim_kernel_init(execdata, kernel, kernelfunc, kernelname);
- sim_kernel_set_node(execdata, kernel, node, 0);
+ sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
}
@@ -354,8 +351,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
- sim_kernel_init(execdata, kernel, kernelfunc, kernelname);
- sim_kernel_set_node(execdata, kernel, node, 0);
+ sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
}
@@ -491,8 +487,7 @@
sim_kernel_source_name(node, NULL, kernelname);
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
- sim_kernel_init(execdata, kernel, kernel_sine, kernelname);
- sim_kernel_set_node(execdata, kernel, node, 0);
+ sim_kernel_init(execdata, kernel, node, kernel_sine, kernelname, 0);
sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_pass.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_pass.c 2010-10-11 08:03:28 UTC (rev 32409)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_pass.c 2010-10-11 08:19:28 UTC (rev 32410)
@@ -93,8 +93,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
- sim_kernel_init(execdata, kernel, kernelfunc, kernelname);
- sim_kernel_set_node(execdata, kernel, node, 0);
+ sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
sim_kernel_enqueue(execdata, kernel, ctx.size, &node->inputevents, &node->events);
}
}
Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_vectormath.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list