Separate RGB Node for Cycles

Hi,
I'm trying (and trying, and trying) to get my hands on cycles. As a first exercise I decided to try to bring the Separate RGB node into it.
I believe I got pretty far (given that I couldn't find any documentation and grep/copy+paste was the way to go). But the node is breaking Blender:

Assertion failed: (input), function add_nodes, file /Users/dfelinto/blender/bf/intern/cycles/blender/blender_shader.cpp, line 476.

The strange is, I get the same error regardless of using CPU or OpenCL. Although, to be honest my OSX doesn't support OpenCL. But the OSL code is so simple I don't think the problem is there.

***
1) remember to run `make install` after applying the patch so the svm_*.h are copied to the addon
2) the crash only happens when I render or enable Rendered in the 3d view
3) it may be better to name the new files more generic to accommodate at least the combine node.
***

Thanks,
Dalai

[dfelinto, 2011-11-28 20:25:39]

On 2011/11/28 20:24:23, dfelinto wrote:

Backtrace:
**********
Assertion failed: (input), function add_nodes, file
/Users/dfelinto/blender/bf/intern/cycles/blender/blender_shader.cpp, line 476.
#0  0x00007fff950c1ce2 in __pthread_kill ()
#1  0x00007fff971fb7d2 in pthread_kill ()
#2  0x00007fff971eca7a in abort ()
#3  0x00007fff9721f5de in __assert_rtn ()
#4  0x00000001011cf846 in add_nodes (graph=0x10a1ee5f0, b_group_node=0x0,
sockets_map=@0x7fff5fbfdc20, b_data={<BL::Pointer> = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, cameras = {ptr = {id =
{data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, scenes = {ptr =
{id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, objects =
{ptr = {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}},
materials = {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data =
0x107883438}}, node_groups = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}, meshes = {ptr = {id = {data = 0x107883438},
type = 0x103496b60, data = 0x107883438}}, lamps = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, libraries = {ptr = {id =
{data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, screens = {ptr =
{id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}},
window_managers = {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data =
0x107883438}}, images = {ptr = {id = {data = 0x107883438}, type = 0x103496b60,
data = 0x107883438}}, lattices = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}, curves = {ptr = {id = {data = 0x107883438},
type = 0x103496b60, data = 0x107883438}}, metaballs = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, fonts = {ptr = {id =
{data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, textures = {ptr
= {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, brushes
= {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}},
worlds = {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data =
0x107883438}}, groups = {ptr = {id = {data = 0x107883438}, type = 0x103496b60,
data = 0x107883438}}, shape_keys = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}, scripts = {ptr = {id = {data = 0x107883438},
type = 0x103496b60, data = 0x107883438}}, texts = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, speakers = {ptr = {id =
{data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, sounds = {ptr =
{id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, armatures
= {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}},
actions = {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data =
0x107883438}}, particles = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}, grease_pencil = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, movieclips = {ptr = {id
= {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}},
b_ntree={<BL::NodeTree> = {<BL::ID> = {<BL::Pointer> = {ptr = {id = {data =
0x106ad2c08}, type = 0x10355fe40, data = 0x106ad2c08}}, <No data fields>}, links
= {ptr = {id = {data = 0x106ad2c08}, type = 0x10355fe40, data = 0x106ad2c08}},
inputs = {ptr = {id = {data = 0x106ad2c08}, type = 0x10355fe40, data =
0x106ad2c08}}, outputs = {ptr = {id = {data = 0x106ad2c08}, type = 0x10355fe40,
data = 0x106ad2c08}}}, nodes = {ptr = {id = {data = 0x106ad2c08}, type =
0x10355fe40, data = 0x106ad2c08}}}) at blender_shader.cpp:476
#5  0x00000001011d0dd1 in ccl::BlenderSync::sync_lamps (this=0x10758ee00) at
blender_shader.cpp:680
#6  0x00000001011d236d in ccl::BlenderSync::sync_shaders (this=0x10758ee00) at
blender_shader.cpp:710
#7  0x00000001011e4231 in ccl::BlenderSync::sync_data (this=0x10758ee00,
b_v3d={<BL::Space> = {<BL::Pointer> = {ptr = {id = {data = 0x106ac07a8}, type =
0x103496b60, data = 0x106ac07a8}}, <No data fields>}, background_images = {ptr =
{id = {data = 0x106ac07a8}, type = 0x103496b60, data = 0x106ac07a8}}}) at
blender_sync.cpp:127
#8  0x00000001011c6640 in ccl::BlenderSession::create_session (this=0x10758bc00)
at blender_session.cpp:88
#9  0x00000001011c728b in ccl::BlenderSession::BlenderSession (this=0x10758bc00,
width_=1024, height_=349, b_engine_={<BL::Pointer> = {ptr = {id = {data = 0x0},
type = 0x10e033a48, data = 0x10a1f3358}}, <No data fields>},
b_data_={<BL::Pointer> = {ptr = {id = {data = 0x107883438}, type = 0x103496b60,
data = 0x107883438}}, cameras = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}, scenes = {ptr = {id = {data = 0x107883438},
type = 0x103496b60, data = 0x107883438}}, objects = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, materials = {ptr = {id =
{data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, node_groups =
{ptr = {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}},
meshes = {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data =
0x107883438}}, lamps = {ptr = {id = {data = 0x107883438}, type = 0x103496b60,
data = 0x107883438}}, libraries = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}, screens = {ptr = {id = {data = 0x107883438},
type = 0x103496b60, data = 0x107883438}}, window_managers = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, images = {ptr = {id =
{data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, lattices = {ptr
= {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, curves =
{ptr = {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}},
metaballs = {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data =
0x107883438}}, fonts = {ptr = {id = {data = 0x107883438}, type = 0x103496b60,
data = 0x107883438}}, textures = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}, brushes = {ptr = {id = {data = 0x107883438},
type = 0x103496b60, data = 0x107883438}}, worlds = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, groups = {ptr = {id =
{data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, shape_keys =
{ptr = {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}},
scripts = {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data =
0x107883438}}, texts = {ptr = {id = {data = 0x107883438}, type = 0x103496b60,
data = 0x107883438}}, speakers = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}, sounds = {ptr = {id = {data = 0x107883438},
type = 0x103496b60, data = 0x107883438}}, armatures = {ptr = {id = {data =
0x107883438}, type = 0x103496b60, data = 0x107883438}}, actions = {ptr = {id =
{data = 0x107883438}, type = 0x103496b60, data = 0x107883438}}, particles = {ptr
= {id = {data = 0x107883438}, type = 0x103496b60, data = 0x107883438}},
grease_pencil = {ptr = {id = {data = 0x107883438}, type = 0x103496b60, data =
0x107883438}}, movieclips = {ptr = {id = {data = 0x107883438}, type =
0x103496b60, data = 0x107883438}}}, b_scene_={<BL::ID> = {<BL::Pointer> = {ptr =
{id = {data = 0x10793e438}, type = 0x1035c1400, data = 0x10793e438}}, <No data
fields>}, object_bases = {ptr = {id = {data = 0x10793e438}, type = 0x1035c1400,
data = 0x10793e438}}, objects = {ptr = {id = {data = 0x10793e438}, type =
0x1035c1400, data = 0x10793e438}}, keying_sets = {ptr = {id = {data =
0x10793e438}, type = 0x1035c1400, data = 0x10793e438}}, keying_sets_all = {ptr =
{id = {data = 0x10793e438}, type = 0x1035c1400, data = 0x10793e438}},
timeline_markers = {ptr = {id = {data = 0x10793e438}, type = 0x1035c1400, data =
0x10793e438}}, orientations = {ptr = {id = {data = 0x10793e438}, type =
0x1035c1400, data = 0x10793e438}}}, b_v3d_={<BL::Space> = {<BL::Pointer> = {ptr
= {id = {data = 0x106ac07a8}, type = 0x103496b60, data = 0x106ac07a8}}, <No data
fields>}, background_images = {ptr = {id = {data = 0x106ac07a8}, type =
0x103496b60, data = 0x106ac07a8}}}, b_rv3d_={<BL::Pointer> = {ptr = {id = {data
= 0x106ac03e8}, type = 0x103496b60, data = 0x106ac03e8}}, <No data fields>}) at
blender_session.cpp:66
#10 0x00000001011c2b2d in create_func (self=0x10d8949e0, args=0x10d8e8c18) at
blender_python.cpp:82
#11 0x00000001018cc9ac in PyEval_EvalFrameEx (f=0x10a1f6520, throwflag=<value
temporarily unavailable, due to optimizations>) at Python/ceval.c:3881
#12 0x00000001018cdd2f in PyEval_EvalCodeEx (_co=0x10dc47b58, globals=<value
temporarily unavailable, due to optimizations>, locals=<value temporarily
unavailable, due to optimizations>, args=0x10a1f64c0, argcount=6,
kws=0x10a1f64f0, kwcount=0, defs=0x10d8bd428, defcount=3, kwdefs=0x0,
closure=0x0) at Python/ceval.c:3317
#13 0x00000001018cbf33 in fast_function [inlined] () at :3979
#14 0x00000001018cbf33 in PyEval_EvalFrameEx (f=0x10a1f6330, throwflag=<value
temporarily unavailable, due to optimizations>) at Python/ceval.c:3902
#15 0x00000001018cdd2f in PyEval_EvalCodeEx (_co=0x10df3c9c0, globals=<value
temporarily unavailable, due to optimizations>, locals=<value temporarily
unavailable, due to optimizations>, args=0x10dbc8728, argcount=2, kws=0x0,
kwcount=0, defs=0x0, defcount=0, kwdefs=0x0, closure=0x0) at Python/ceval.c:3317
#16 0x000000010184f3aa in function_call (func=0x10dc08c00, arg=0x10dbc8710,
kw=0x0) at Objects/funcobject.c:629
#17 0x0000000101822618 in PyObject_Call (func=0x10dc08c00, arg=0x10dbc8710,
kw=0x0) at Objects/abstract.c:2149
#18 0x000000010053d452 in bpy_class_call (C=0x1068216e8, ptr=0x7fff5fbff948,
func=0x1035b4f40, parms=0x7fff5fbff928) at bpy_rna.c:6831
#19 0x00000001010a99ed in engine_view_update (engine=0x10a1f3358,
context=0x1068216e8) at rna_render.c:110
(... cut to fit in the 10,000 characters limit)

[brechtvl, 2011-11-29 10:16:57]

http://codereview.appspot.com/5444047/diff/1/intern/cycles/render/nodes.cpp
File intern/cycles/render/nodes.cpp (right):

http://codereview.appspot.com/5444047/diff/1/intern/cycles/render/nodes.cpp#n...
intern/cycles/render/nodes.cpp:1636: add_input("Color", SHADER_SOCKET_COLOR);
Socket names should match Blender node.

http://codereview.appspot.com/5444047/diff/1/intern/cycles/render/nodes.cpp#n...
intern/cycles/render/nodes.cpp:1648: 
Missing compiler.stack_assign(color_in);

[dfelinto, 2011-11-29 17:18:08]

Final patch - separate + combine RGB nodes.

[dfelinto, 2011-11-29 17:21:06]

I don't know if we need to wait for next release for this kind of patch. but I
will leave to you (Brecht) to ponder on that, ok?

If you think the patch is good please go ahead and commit (or let me know and I
commit it myself).
Thanks

http://codereview.appspot.com/5444047/diff/6002/intern/cycles/kernel/svm/svm_...
File intern/cycles/kernel/svm/svm_sepcomb_rgb.h (right):

http://codereview.appspot.com/5444047/diff/6002/intern/cycles/kernel/svm/svm_...
intern/cycles/kernel/svm/svm_sepcomb_rgb.h:26: stack_store_float(stack,
out_offset+color_index, color);
I'm using 'old fashion' + to write to the right element of my array. I hope this
is fine. It works great here.