diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:18:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:18:52 +0300 |
commit | de777ad9e69320500bf05d97a7d6d60ba4fd0a93 (patch) | |
tree | a1141843a3e1df137bbc6490641bedf12a12a8fa /intern/cycles/device | |
parent | 6d38d824377c55aaaed7e8283e81a7128bf6f728 (diff) | |
parent | 1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device.h | 7 | ||||
-rw-r--r-- | intern/cycles/device/device_intern.h | 1 | ||||
-rw-r--r-- | intern/cycles/device/device_memory.cpp | 1 | ||||
-rw-r--r-- | intern/cycles/device/device_memory.h | 3 | ||||
-rw-r--r-- | intern/cycles/device/device_multi.cpp | 1 | ||||
-rw-r--r-- | intern/cycles/device/device_network.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/device_network.h | 7 | ||||
-rw-r--r-- | intern/cycles/device/device_split_kernel.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/device/device_split_kernel.h | 3 | ||||
-rw-r--r-- | intern/cycles/device/device_task.cpp | 1 | ||||
-rw-r--r-- | intern/cycles/device/device_task.h | 1 | ||||
-rw-r--r-- | intern/cycles/device/opencl/memory_manager.cpp | 1 | ||||
-rw-r--r-- | intern/cycles/device/opencl/memory_manager.h | 1 |
13 files changed, 8 insertions, 25 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 31deba2d796..585d9802279 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -123,7 +123,7 @@ public: /* Use OpenSubdiv patch evaluation */ bool use_patch_evaluation; - + /* Use Transparent shadows */ bool use_transparent; @@ -307,7 +307,7 @@ public: /* open shading language, only for CPU device */ virtual void *osl_memory() { return NULL; } - /* load/compile kernels, must be called before adding tasks */ + /* load/compile kernels, must be called before adding tasks */ virtual bool load_kernels( const DeviceRequestedFeatures& /*requested_features*/) { return true; } @@ -317,7 +317,7 @@ public: virtual void task_add(DeviceTask& task) = 0; virtual void task_wait() = 0; virtual void task_cancel() = 0; - + /* opengl drawing */ virtual void draw_pixels(device_memory& mem, int y, int w, int h, int width, int height, @@ -376,4 +376,3 @@ private: CCL_NAMESPACE_END #endif /* __DEVICE_H__ */ - diff --git a/intern/cycles/device/device_intern.h b/intern/cycles/device/device_intern.h index de487649045..941be448101 100644 --- a/intern/cycles/device/device_intern.h +++ b/intern/cycles/device/device_intern.h @@ -41,4 +41,3 @@ string device_cuda_capabilities(void); CCL_NAMESPACE_END #endif /* __DEVICE_INTERN_H__ */ - diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/device_memory.cpp index 482af685011..a8d29896553 100644 --- a/intern/cycles/device/device_memory.cpp +++ b/intern/cycles/device/device_memory.cpp @@ -138,4 +138,3 @@ device_sub_ptr::~device_sub_ptr() } CCL_NAMESPACE_END - diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h index b6f3c2913a5..2b4835c9c65 100644 --- a/intern/cycles/device/device_memory.h +++ b/intern/cycles/device/device_memory.h @@ -51,7 +51,7 @@ enum DataType { TYPE_UINT64, }; -static inline size_t datatype_size(DataType datatype) +static inline size_t datatype_size(DataType datatype) { switch(datatype) { case TYPE_UNKNOWN: return 1; @@ -497,4 +497,3 @@ protected: CCL_NAMESPACE_END #endif /* __DEVICE_MEMORY_H__ */ - diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 65102c3f20f..587840e551f 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -379,4 +379,3 @@ Device *device_multi_create(DeviceInfo& info, Stats &stats, bool background) } CCL_NAMESPACE_END - diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp index 5ad4405366e..204e405421d 100644 --- a/intern/cycles/device/device_network.cpp +++ b/intern/cycles/device/device_network.cpp @@ -797,5 +797,3 @@ void Device::server_run() CCL_NAMESPACE_END #endif - - diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index b734ba2bda9..96e0de742db 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -179,7 +179,7 @@ public: boost::asio::write(socket, boost::asio::buffer(archive_str), boost::asio::transfer_all(), error); - + if(error.value()) error_func->network_error(error.message()); @@ -193,7 +193,7 @@ public: boost::asio::write(socket, boost::asio::buffer(buffer, size), boost::asio::transfer_all(), error); - + if(error.value()) error_func->network_error(error.message()); } @@ -467,7 +467,7 @@ private: /* buffer and endpoint for receiving messages */ char receive_buffer[256]; boost::asio::ip::udp::endpoint receive_endpoint; - + // os, version, devices, status, host name, group name, ip as far as fields go struct ServerInfo { string cycles_version; @@ -489,4 +489,3 @@ CCL_NAMESPACE_END #endif #endif /* __DEVICE_NETWORK_H__ */ - diff --git a/intern/cycles/device/device_split_kernel.cpp b/intern/cycles/device/device_split_kernel.cpp index 74135a1f3c8..efaae8c84f4 100644 --- a/intern/cycles/device/device_split_kernel.cpp +++ b/intern/cycles/device/device_split_kernel.cpp @@ -261,7 +261,7 @@ bool DeviceSplitKernel::path_trace(DeviceTask *task, ENQUEUE_SPLIT_KERNEL(buffer_update, global_size, local_size); if(task->get_cancel() && cancel_time == DBL_MAX) { - /* Wait up to twice as many seconds for current samples to finish + /* Wait up to twice as many seconds for current samples to finish * to avoid artifacts in render result from ending too soon. */ cancel_time = time_dt() + 2.0 * time_multiplier; @@ -322,5 +322,3 @@ bool DeviceSplitKernel::path_trace(DeviceTask *task, } CCL_NAMESPACE_END - - diff --git a/intern/cycles/device/device_split_kernel.h b/intern/cycles/device/device_split_kernel.h index 2ec0261e847..26ddce5bb22 100644 --- a/intern/cycles/device/device_split_kernel.h +++ b/intern/cycles/device/device_split_kernel.h @@ -131,6 +131,3 @@ public: CCL_NAMESPACE_END #endif /* __DEVICE_SPLIT_KERNEL_H__ */ - - - diff --git a/intern/cycles/device/device_task.cpp b/intern/cycles/device/device_task.cpp index 3c7d24fb5b7..8310863886c 100644 --- a/intern/cycles/device/device_task.cpp +++ b/intern/cycles/device/device_task.cpp @@ -126,4 +126,3 @@ void DeviceTask::update_progress(RenderTile *rtile, int pixel_samples) } CCL_NAMESPACE_END - diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index b9658eb978f..ec87aa8c560 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -86,4 +86,3 @@ protected: CCL_NAMESPACE_END #endif /* __DEVICE_TASK_H__ */ - diff --git a/intern/cycles/device/opencl/memory_manager.cpp b/intern/cycles/device/opencl/memory_manager.cpp index 75c9de65035..485a656cb83 100644 --- a/intern/cycles/device/opencl/memory_manager.cpp +++ b/intern/cycles/device/opencl/memory_manager.cpp @@ -254,4 +254,3 @@ void MemoryManager::set_kernel_arg_buffers(cl_kernel kernel, cl_uint *narg) CCL_NAMESPACE_END #endif /* WITH_OPENCL */ - diff --git a/intern/cycles/device/opencl/memory_manager.h b/intern/cycles/device/opencl/memory_manager.h index b3d861275f0..b49bd32dab6 100644 --- a/intern/cycles/device/opencl/memory_manager.h +++ b/intern/cycles/device/opencl/memory_manager.h @@ -104,4 +104,3 @@ public: }; CCL_NAMESPACE_END - |