[Bf-cycles] build with OSL support

Kel M kelvinshrek at gmail.com
Tue Nov 8 17:07:01 CET 2011


Re applied patch, it appears that part of it failed:

patching file intern/cycles/render/nodes.cpp
patching file intern/cycles/render/nodes.h
patching file intern/cycles/test/test_closure/__init__.py
patching file intern/cycles/test/test_closure/bsdf_oren_nayar.xml
patching file intern/cycles/app/cycles_xml.cpp
patching file intern/cycles/kernel/osl/osl_closures.cpp
patching file intern/cycles/kernel/osl/osl_closures.h
patching file intern/cycles/kernel/osl/nodes/node_oren_nayar_bsdf.osl
patching file intern/cycles/kernel/osl/nodes/CMakeLists.txt
patching file intern/cycles/kernel/osl/nodes/stdosl.h
patching file intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
patching file intern/cycles/kernel/osl/CMakeLists.txt
patching file intern/cycles/kernel/svm/bsdf_oren_nayar.h
patching file intern/cycles/kernel/svm/svm_closure.h
patching file intern/cycles/kernel/svm/svm_types.h
patching file intern/cycles/kernel/svm/svm_bsdf.h
patching file intern/cycles/kernel/CMakeLists.txt
patching file intern/cycles/blender/blender_shader.cpp
Hunk #1 succeeded at 222 (offset -4 lines).
patching file source/blender/blenkernel/BKE_node.h
Hunk #1 succeeded at 490 (offset 2 lines).
patching file source/blender/blenkernel/intern/node.c
Hunk #1 succeeded at 1905 with fuzz 1 (offset 4 lines).
patching file source/blender/gpu/intern/gpu_shader_material.glsl
patching file source/blender/gpu/intern/gpu_shader_material.glsl.c
patching file source/blender/makesrna/intern/rna_nodetree_types.h
Hunk #1 FAILED at 67.
1 out of 1 hunk FAILED -- saving rejects to file
source/blender/makesrna/intern/rna_nodetree_types.h.rej
patching file
source/blender/nodes/shader/nodes/node_shader_bsdf_oren_nayar.c
patching file source/blender/nodes/NOD_shader.h
Hunk #1 succeeded at 80 with fuzz 1.
patching file source/blender/nodes/CMakeLists.txt
Hunk #1 succeeded at 131 with fuzz 2 (offset 3 lines).

On Tue, Nov 8, 2011 at 11:03 AM, Kel M <kelvinshrek at gmail.com> wrote:

> Sorry about that, tried again, not sure if it's the same error, but this
> time it failed at 100%:
>
> [100%] [100%] [100%] [100%] Building CXX object
> intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_camera.cpp.o
> Building CXX object
> intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_object.cpp.o
> Building CXX object
> intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_mesh.cpp.o
> Building CXX object
> intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_python.cpp.o
> In file included from
> /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_python.cpp:21:0:
> /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_sync.h:22:30:
> fatal error: MEM_guardedalloc.h: No such file or directory
> compilation terminated.
> make[2]: ***
> [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_python.cpp.o]
> Error 1
> make[2]: *** Waiting for unfinished jobs....
> In file included from
> /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_mesh.cpp:23:0:
> /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_sync.h:22:30:
> fatal error: MEM_guardedalloc.h: No such file or directory
> compilation terminated.
> make[2]: ***
> [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_mesh.cpp.o]
> Error 1
> In file included from
> /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_camera.cpp:22:0:
> /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_sync.h:22:30:
> fatal error: MEM_guardedalloc.h: No such file or directory
> compilation terminated.
> make[2]: ***
> [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_camera.cpp.o]
> Error 1
> In file included from
> /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_object.cpp:24:0:
> /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_sync.h:22:30:
> fatal error: MEM_guardedalloc.h: No such file or directory
> compilation terminated.
> make[2]: ***
> [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_object.cpp.o]
> Error 1
> make[1]: *** [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/all]
> Error 2
> make: *** [all] Error 2
>
>
>
> On Tue, Nov 8, 2011 at 10:47 AM, Thomas Dinges <blender at dingto.org> wrote:
>
>>  1) This patch is not finished as he said.
>> 2) Without pasting the error message here, not helpful. :)
>>
>> Am 08.11.2011 16:45, schrieb Kel M:
>>
>> Your patch doesn't compile. I get error 2 at around 76%.
>>
>> On Mon, Nov 7, 2011 at 12:18 PM, Yasuhiro Fujii <
>> y-fujii at mimosa-pudica.net> wrote:
>>
>>> I've submitted the O-N patch.
>>>
>>>
>>> http://projects.blender.org/tracker/index.php?func=detail&aid=29193&group_id=9&atid=127
>>>
>>> Sorry to bother you when you are busy with merging cycles to trunk.
>>>
>>> -- y.fujii
>>>
>>> On Tue, Nov 8, 2011 at 12:04 AM, Brecht Van Lommel
>>>  <brechtvanlommel at pandora.be> wrote:
>>> > No, that's not necessary, when we actually start supporting OSL, we
>>> > can ensure it's all in sync. For now it's ok if this is untested.
>>> >
>>> > Brecht.
>>> >
>>> > On Mon, Nov 7, 2011 at 3:43 PM, Yasuhiro Fujii
>>> > <y-fujii at mimosa-pudica.net> wrote:
>>> >> Thanks for reply.
>>> >> Should I wait to submit my Oren-Nayar patch until OSL support will
>>> come back?
>>> >> Its OSL code is not tested.
>>> >>
>>> >> -- y.fujii
>>> >>
>>> >> On Mon, Nov 7, 2011 at 9:04 PM, Brecht Van Lommel
>>> >> <brechtvanlommel at pandora.be> wrote:
>>> >>> It's indeed broken currently, trailing behind the latest changes a
>>> >>> bit. I'd suggest to just keep it disabled for building for now.
>>> >>>
>>> >>> Brecht.
>>> >>>
>>> >>> On Mon, Nov 7, 2011 at 6:28 AM, Yasuhiro Fujii
>>> >>> <y-fujii at mimosa-pudica.net> wrote:
>>> >>>> Building cycles with OSL is currently broken?
>>> >>>> The error is below:
>>> >>>>
>>> >>>> intern/cycles/kernel/kernel.cpp: ccl::kernel_globals_create():
>>> >>>>  "struct ccl::KernelGlobals" has no member named "osl"
>>> >>>>
>>> >>>> -- y.fujii
>>> >>>> _______________________________________________
>>> >>>> Bf-cycles mailing list
>>> >>>> Bf-cycles at blender.org
>>> >>>> http://lists.blender.org/mailman/listinfo/bf-cycles
>>> >>>>
>>> >>> _______________________________________________
>>> >>> Bf-cycles mailing list
>>> >>> Bf-cycles at blender.org
>>> >>> http://lists.blender.org/mailman/listinfo/bf-cycles
>>> >>>
>>> >> _______________________________________________
>>> >> Bf-cycles mailing list
>>> >> Bf-cycles at blender.org
>>> >> http://lists.blender.org/mailman/listinfo/bf-cycles
>>> >>
>>> > _______________________________________________
>>> > Bf-cycles mailing list
>>> > Bf-cycles at blender.org
>>> > http://lists.blender.org/mailman/listinfo/bf-cycles
>>> >
>>> _______________________________________________
>>> Bf-cycles mailing list
>>> Bf-cycles at blender.org
>>> http://lists.blender.org/mailman/listinfo/bf-cycles
>>>
>>
>>
>>
>> _______________________________________________
>> Bf-cycles mailing listBf-cycles at blender.orghttp://lists.blender.org/mailman/listinfo/bf-cycles
>>
>>
>>
>> --
>> Thomas Dinges
>> Blender Developer, Artist and Musician
>> www.dingto.org
>>
>>
>> _______________________________________________
>> Bf-cycles mailing list
>> Bf-cycles at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-cycles
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/bf-cycles/attachments/20111108/059c6119/attachment.htm 


More information about the Bf-cycles mailing list