[Bf-blender-cvs] [e3c947d] cycles_split_kernel: Cycles: Fix building with network device enabled

Mai Lavelle noreply at git.blender.org
Thu Dec 29 11:22:46 CET 2016


Commit: e3c947de5b233d5b391816edf18199d175f08a01
Author: Mai Lavelle
Date:   Thu Dec 29 05:22:02 2016 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rBe3c947de5b233d5b391816edf18199d175f08a01

Cycles: Fix building with network device enabled

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

M	intern/cycles/device/device_network.cpp

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

diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp
index 53eef6c..6dc4aec 100644
--- a/intern/cycles/device/device_network.cpp
+++ b/intern/cycles/device/device_network.cpp
@@ -87,8 +87,14 @@ public:
 		snd.write();
 	}
 
-	void mem_alloc(device_memory& mem, MemoryType type)
+	void mem_alloc(const char *name, device_memory& mem, MemoryType type)
 	{
+		if(name) {
+			VLOG(1) << "Buffer allocate: " << name << ", "
+				    << string_human_readable_number(mem.memory_size()) << " bytes. ("
+				    << string_human_readable_size(mem.memory_size()) << ")";
+		}
+
 		thread_scoped_lock lock(rpc_lock);
 
 		mem.device_pointer = ++mem_counter;
@@ -481,7 +487,7 @@ protected:
 				mem.data_pointer = 0;
 
 			/* perform the allocation on the actual device */
-			device->mem_alloc(mem, type);
+			device->mem_alloc(NULL, mem, type);
 
 			/* store a mapping to/from client_pointer and real device pointer */
 			pointer_mapping_insert(client_pointer, mem.device_pointer);




More information about the Bf-blender-cvs mailing list