[Bf-blender-cvs] [f0a0b1e] master: Cycles: Assert in the cases when SVM node was not handled

Sergey Sharybin noreply at git.blender.org
Mon Jun 1 16:50:15 CEST 2015


Commit: f0a0b1eaaccf9c314f24fed8c42b27e9b219c693
Author: Sergey Sharybin
Date:   Mon Jun 1 18:21:29 2015 +0500
Branches: master
https://developer.blender.org/rBf0a0b1eaaccf9c314f24fed8c42b27e9b219c693

Cycles: Assert in the cases when SVM node was not handled

This will help figuring out cases when node was not properly handled by the SVM
by aborting execution on CPU, where all the nodes are expected to be supported.

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

M	intern/cycles/kernel/svm/svm.h

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

diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 42a581c..15ac651 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -448,7 +448,9 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, Shade
 #  endif  /* __EXTRA_NODES__ */
 #endif  /* NODES_GROUP(NODE_GROUP_LEVEL_3) */
 			case NODE_END:
+				return;
 			default:
+				kernel_assert(!"Unknown node type was passed to the SVM machine");
 				return;
 		}
 	}




More information about the Bf-blender-cvs mailing list