[Bf-blender-cvs] [989810f] object_nodes: Disabled compiling and eval of broken BVM functions, to simplify debugging until they can be reimplemented.

[Lukas Tönne]

Commit: 989810f3122d41247232fbc22dfa8eacb871be58
Author: Lukas Tönne
Date:   Fri Jun 10 11:07:55 2016 +0200
Branches: object_nodes
https://developer.blender.org/rB989810f3122d41247232fbc22dfa8eacb871be58

Disabled compiling and eval of broken BVM functions, to simplify debugging 
until they can be reimplemented.

===================================================================

M       source/blender/blenvm/compile/bvm_codegen.cc
M       source/blender/blenvm/compile/bvm_function.cc
M       source/blender/blenvm/intern/bvm_api.cc

===================================================================

diff --git a/source/blender/blenvm/compile/bvm_codegen.cc 
b/source/blender/blenvm/compile/bvm_codegen.cc
index 9d9ddb6..6b34bdf 100644
--- a/source/blender/blenvm/compile/bvm_codegen.cc
+++ b/source/blender/blenvm/compile/bvm_codegen.cc
@@ -633,10 +633,11 @@ int BVMCompiler::current_address() const
 
 FunctionBVM *BVMCompiler::compile_function(const NodeGraph &graph)
 {
-       resolve_symbols(graph);
-       
        fn = new FunctionBVM();
        
+#if 0
+       resolve_symbols(graph);
+       
        int entry_point = codegen_graph(graph);
        fn->set_entry_point(entry_point);
        
@@ -663,6 +664,7 @@ FunctionBVM *BVMCompiler::compile_function(const NodeGraph 
&graph)
                StackIndex stack_index = output_index.at(output.key);
                fn->add_return_value(output.typedesc, output.name, stack_index);
        }
+#endif
        
        FunctionBVM *result = fn;
        fn = NULL;
diff --git a/source/blender/blenvm/compile/bvm_function.cc 
b/source/blender/blenvm/compile/bvm_function.cc
index 6142361..4c9a837 100644
--- a/source/blender/blenvm/compile/bvm_function.cc
+++ b/source/blender/blenvm/compile/bvm_function.cc
@@ -90,6 +90,7 @@ void FunctionBVM::add_return_value(const TypeDesc &typedesc, 
const string &name,
 
 void FunctionBVM::eval(EvalContext *context, const EvalGlobals *globals, const 
void *arguments[], void *results[]) const
 {
+#if 0
        EvalStack stack[BVM_STACK_SIZE] = {0};
        
        /* initialize input arguments */
@@ -113,6 +114,7 @@ void FunctionBVM::eval(EvalContext *context, const 
EvalGlobals *globals, const v
                
                typespec->copy_value(results[i], (void *)value);
        }
+#endif
 }
 
 } /* namespace blenvm */
diff --git a/source/blender/blenvm/intern/bvm_api.cc 
b/source/blender/blenvm/intern/bvm_api.cc
index 3a0a465..16dfe8c 100644
--- a/source/blender/blenvm/intern/bvm_api.cc
+++ b/source/blender/blenvm/intern/bvm_api.cc
@@ -818,7 +818,11 @@ struct DerivedMesh *BVM_eval_modifier_bvm(struct 
BVMEvalGlobals *globals,
        
        _FUNC_BVM(fn)->eval(_CTX(ctx), _GLOBALS(globals), args, results);
        
+#if 0
        DerivedMesh *dm = result.get();
+#else
+       DerivedMesh *dm = CDDM_new(0, 0, 0, 0, 0);
+#endif
        /* destroy the pointer variable */
        result.ptr().reset();
        return dm;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs