[Bf-blender-cvs] [0f94333] master: Code cleanup: remove some unused functions.

Brecht Van Lommel noreply at git.blender.org
Thu May 5 21:44:28 CEST 2016


Commit: 0f943337bc04c9cae1bf1728d29c45947ee3c7e5
Author: Brecht Van Lommel
Date:   Mon May 2 21:30:37 2016 +0200
Branches: master
https://developer.blender.org/rB0f943337bc04c9cae1bf1728d29c45947ee3c7e5

Code cleanup: remove some unused functions.

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

M	intern/cycles/render/svm.cpp
M	intern/cycles/render/svm.h

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

diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp
index 350ef92..ed04081 100644
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@ -185,34 +185,6 @@ void SVMCompiler::stack_clear_offset(ShaderSocketType type, int offset)
 		active_stack.users[offset + i]--;
 }
 
-void SVMCompiler::stack_backup(StackBackup& backup, ShaderNodeSet& done)
-{
-	backup.done = done;
-	backup.stack = active_stack;
-
-	foreach(ShaderNode *node, current_graph->nodes) {
-		foreach(ShaderInput *input, node->inputs)
-			backup.offsets.push_back(input->stack_offset);
-		foreach(ShaderOutput *output, node->outputs)
-			backup.offsets.push_back(output->stack_offset);
-	}
-}
-
-void SVMCompiler::stack_restore(StackBackup& backup, ShaderNodeSet& done)
-{
-	int i = 0;
-
-	done = backup.done;
-	active_stack = backup.stack;
-
-	foreach(ShaderNode *node, current_graph->nodes) {
-		foreach(ShaderInput *input, node->inputs)
-			input->stack_offset = backup.offsets[i++];
-		foreach(ShaderOutput *output, node->outputs)
-			output->stack_offset = backup.offsets[i++];
-	}
-}
-
 void SVMCompiler::stack_assign(ShaderInput *input)
 {
 	/* stack offset assign? */
diff --git a/intern/cycles/render/svm.h b/intern/cycles/render/svm.h
index b86a00b..1c01ee5 100644
--- a/intern/cycles/render/svm.h
+++ b/intern/cycles/render/svm.h
@@ -146,12 +146,6 @@ protected:
 		int users[SVM_STACK_SIZE];
 	};
 
-	struct StackBackup {
-		Stack stack;
-		vector<int> offsets;
-		ShaderNodeSet done;
-	};
-
 	/* Global state of the compiler accessible from the compilation routines. */
 	struct CompilerState {
 		CompilerState(ShaderGraph *graph);
@@ -176,9 +170,6 @@ protected:
 		vector<bool> nodes_done_flag;
 	};
 
-	void stack_backup(StackBackup& backup, ShaderNodeSet& done);
-	void stack_restore(StackBackup& backup, ShaderNodeSet& done);
-
 	void stack_clear_temporary(ShaderNode *node);
 	int stack_size(ShaderSocketType type);
 	void stack_clear_users(ShaderNode *node, ShaderNodeSet& done);




More information about the Bf-blender-cvs mailing list