[Bf-blender-cvs] [f0d53df716c] functions: rename "LLVMGenBody" -> "LLVMGenerateIRBody"

Jacques Lucke noreply at git.blender.org
Mon Mar 4 14:16:54 CET 2019


Commit: f0d53df716c39db71c8f1ed574130771393b9b62
Author: Jacques Lucke
Date:   Mon Mar 4 13:37:00 2019 +0100
Branches: functions
https://developer.blender.org/rBf0d53df716c39db71c8f1ed574130771393b9b62

rename "LLVMGenBody" -> "LLVMGenerateIRBody"

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

M	source/blender/functions/backends/llvm/compiled_body.cpp
M	source/blender/functions/backends/llvm/from_tuple_call.cpp
M	source/blender/functions/backends/llvm/from_tuple_call.hpp
M	source/blender/functions/backends/llvm/llvm_gen.cpp
M	source/blender/functions/backends/llvm/llvm_gen.hpp
M	source/blender/functions/backends/llvm/to_tuple_call.cpp
M	source/blender/functions/functions/scalar_math.cpp

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

diff --git a/source/blender/functions/backends/llvm/compiled_body.cpp b/source/blender/functions/backends/llvm/compiled_body.cpp
index e3a01c213c8..a1e66646224 100644
--- a/source/blender/functions/backends/llvm/compiled_body.cpp
+++ b/source/blender/functions/backends/llvm/compiled_body.cpp
@@ -47,7 +47,7 @@ namespace FN {
 		llvm::BasicBlock *bb = llvm::BasicBlock::Create(context, "entry", function);
 		llvm::IRBuilder<> builder(bb);
 
-		LLVMGenBody *gen_body = fn->body<LLVMGenBody>();
+		LLVMGenerateIRBody *gen_body = fn->body<LLVMGenerateIRBody>();
 		BLI_assert(gen_body);
 
 		LLVMValues output_values;
@@ -72,7 +72,7 @@ namespace FN {
 			return true;
 		}
 
-		if (fn->body<LLVMGenBody>() != nullptr) {
+		if (fn->body<LLVMGenerateIRBody>() != nullptr) {
 			fn->add_body(compile_llvm_body(fn, context));
 			return true;
 		}
diff --git a/source/blender/functions/backends/llvm/from_tuple_call.cpp b/source/blender/functions/backends/llvm/from_tuple_call.cpp
index 89d4bfa54e0..1d9f202c2ee 100644
--- a/source/blender/functions/backends/llvm/from_tuple_call.cpp
+++ b/source/blender/functions/backends/llvm/from_tuple_call.cpp
@@ -25,7 +25,7 @@ namespace FN {
 		body->call(*fn_in, *fn_out);
 	}
 
-	class TupleCallLLVM : public LLVMGenBody {
+	class TupleCallLLVM : public LLVMGenerateIRBody {
 	private:
 		TupleCallBody *m_tuple_call;
 		SharedTupleMeta m_in_meta;
@@ -148,7 +148,7 @@ namespace FN {
 		}
 	};
 
-	LLVMGenBody *llvm_body_for_tuple_call(
+	LLVMGenerateIRBody *llvm_body_for_tuple_call(
 		TupleCallBody *tuple_call_body)
 	{
 		return new TupleCallLLVM(tuple_call_body);
diff --git a/source/blender/functions/backends/llvm/from_tuple_call.hpp b/source/blender/functions/backends/llvm/from_tuple_call.hpp
index f06862244c5..cd4c2a3c6fc 100644
--- a/source/blender/functions/backends/llvm/from_tuple_call.hpp
+++ b/source/blender/functions/backends/llvm/from_tuple_call.hpp
@@ -7,7 +7,7 @@ namespace FN {
 
 	class TupleCallBody;
 
-	LLVMGenBody *llvm_body_for_tuple_call(
+	LLVMGenerateIRBody *llvm_body_for_tuple_call(
 		TupleCallBody *tuple_call_body);
 
 } /* namespace FN */
\ No newline at end of file
diff --git a/source/blender/functions/backends/llvm/llvm_gen.cpp b/source/blender/functions/backends/llvm/llvm_gen.cpp
index 73abd39dbd3..106b6c7473a 100644
--- a/source/blender/functions/backends/llvm/llvm_gen.cpp
+++ b/source/blender/functions/backends/llvm/llvm_gen.cpp
@@ -2,14 +2,14 @@
 
 namespace FN {
 
-	const char *LLVMGenBody::identifier_in_composition()
+	const char *LLVMGenerateIRBody::identifier_in_composition()
 	{
 		return "LLVM Gen Body";
 	}
 
-	void LLVMGenBody::free_self(void *value)
+	void LLVMGenerateIRBody::free_self(void *value)
 	{
-		LLVMGenBody *v = (LLVMGenBody *)value;
+		LLVMGenerateIRBody *v = (LLVMGenerateIRBody *)value;
 		delete v;
 	}
 
diff --git a/source/blender/functions/backends/llvm/llvm_gen.hpp b/source/blender/functions/backends/llvm/llvm_gen.hpp
index 5a473c48c47..0105b71ca50 100644
--- a/source/blender/functions/backends/llvm/llvm_gen.hpp
+++ b/source/blender/functions/backends/llvm/llvm_gen.hpp
@@ -8,12 +8,12 @@ namespace FN {
 	using LLVMValues = SmallVector<llvm::Value *>;
 	using LLVMTypes = BLI::SmallVector<llvm::Type *>;
 
-	class LLVMGenBody : public FunctionBody {
+	class LLVMGenerateIRBody : public FunctionBody {
 	public:
 		static const char *identifier_in_composition();
 		static void free_self(void *value);
 
-		virtual ~LLVMGenBody() {};
+		virtual ~LLVMGenerateIRBody() {};
 
 		virtual void build_ir(
 			llvm::IRBuilder<> &builder,
diff --git a/source/blender/functions/backends/llvm/to_tuple_call.cpp b/source/blender/functions/backends/llvm/to_tuple_call.cpp
index 5138f3cbd30..3d79888d717 100644
--- a/source/blender/functions/backends/llvm/to_tuple_call.cpp
+++ b/source/blender/functions/backends/llvm/to_tuple_call.cpp
@@ -152,7 +152,7 @@ namespace FN {
 		SharedFunction &fn,
 		llvm::LLVMContext &context)
 	{
-		auto *body = fn->body<LLVMGenBody>();
+		auto *body = fn->body<LLVMGenerateIRBody>();
 		return compile_ir_to_tuple_call(fn, context, [body](
 				llvm::IRBuilder<> &builder,
 				const LLVMValues &inputs,
@@ -175,7 +175,7 @@ namespace FN {
 			return true;
 		}
 
-		if (fn->body<LLVMGenBody>() != nullptr) {
+		if (fn->body<LLVMGenerateIRBody>() != nullptr) {
 			fn->add_body(build_from_ir_generator(fn, context));
 			return true;
 		}
diff --git a/source/blender/functions/functions/scalar_math.cpp b/source/blender/functions/functions/scalar_math.cpp
index 5074eafd80c..39e2129608f 100644
--- a/source/blender/functions/functions/scalar_math.cpp
+++ b/source/blender/functions/functions/scalar_math.cpp
@@ -30,7 +30,7 @@ namespace FN { namespace Functions {
 		}
 	};
 
-	class GenAddFloats : public LLVMGenBody {
+	class GenAddFloats : public LLVMGenerateIRBody {
 		void build_ir(
 			llvm::IRBuilder<> &builder,
 			const LLVMValues &inputs,



More information about the Bf-blender-cvs mailing list