cca35c1013
Merge branch 'blender2.7'
2019-01-11 15:09:46 +01:00
e5a1a9288c
Fix T60320: Cycles OpenCL denoising filter errors on some drivers.
2019-01-11 11:25:37 +01:00
ddabad2410
Merge branch 'blender2.7'
2019-01-09 12:56:50 +01:00
b486088218
Fix T60320: Cycles OpenCL volume rendering error on some drivers.
2019-01-08 15:59:10 +01:00
8491dba0c6
Fix T60300: Cycles SSS render hanging with AMD OpenCL.
2019-01-08 15:37:16 +01:00
88e45b8c99
Merge branch 'blender2.7'
2019-01-03 18:32:51 +01:00
fffdedbcc1
Fix T54962: Cycles crash using subsurface scattering texture blur.
2019-01-03 17:10:37 +01:00
017573495e
Merge branch 'blender2.7'
2019-01-02 19:58:26 +01:00
f7e9642da9
Fix T60061: Cycles OSL point density not working.
...
Add override keywords so we can detect when the function definitions change.
2019-01-02 19:56:49 +01:00
5216dd5fce
Merge branch 'blender2.7'
2018-12-27 10:53:02 +01:00
8e331c3431
Fix T59565: NaN/crash with zero radius tip of hair curves.
2018-12-21 18:54:45 +01:00
f60018e425
Merge branch 'master' into blender2.8
2018-12-11 15:18:43 +01:00
765795aed7
Fix macOS buildbot build, wrong CUDA version check.
2018-12-11 14:16:48 +01:00
606223f6a6
Merge branch 'master' into blender2.8
2018-12-07 15:54:17 +11:00
cccc40db51
Fix T57963: Cycles crash using AO for displacement.
...
Note this is not supported, there exists no geometry at this point, but
it should not crash at least.
2018-12-06 19:50:05 +01:00
4a21345665
Merge branch 'master' into blender2.8
2018-12-05 12:54:45 +01:00
f5b46daf52
Fix build with old CMake versions.
2018-12-05 12:53:19 +01:00
b9b88d59dd
Merge branch 'master' into blender2.8
2018-12-04 16:35:16 +01:00
f63da3dcf5
Buildbot: enable support for NVIDIA Turing cards in Cycles (like GTX 20xx).
...
We currently only build the sm_7x kernels with CUDA 10.0, older cards still
use 9.1 until rendering errors are solved for them.
2018-12-04 16:03:18 +01:00
b14ec18601
Cycles: add initial CUDA 10.0 support, but only recommend use for Turing cards.
...
There may still be rendering errors when used for older graphics cards.
2018-12-04 16:03:18 +01:00
df2635099b
Merge branch 'master' into blender2.8
2018-12-04 11:45:22 +01:00
5a6f1fa563
Fix T58600: update OSL scripts to work with OSL 1.10.x.
2018-12-03 15:14:21 +01:00
9893fee4e6
Merge branch 'master' into blender2.8
2018-11-29 12:55:58 +11:00
7fa6f72084
Cycles: Add sample-based runtime profiler that measures time spent in various parts of the CPU kernel
...
This commit adds a sample-based profiler that runs during CPU rendering and collects statistics on time spent in different parts of the kernel (ray intersection, shader evaluation etc.) as well as time spent per material and object.
The results are currently not exposed in the user interface or per Python yet, to see the stats on the console pass the "--cycles-print-stats" argument to Cycles (e.g. "./blender -- --cycles-print-stats").
Unfortunately, there is no clear way to extend this functionality to CUDA or OpenCL, so it is CPU-only for now.
Reviewers: brecht, sergey, swerner
Reviewed By: brecht, swerner
Differential Revision: https://developer.blender.org/D3892
2018-11-29 02:45:24 +01:00
059c119719
Merge branch 'master' into blender2.8
2018-11-25 08:01:53 +11:00
e742e0934d
Cleanup: trailing space
2018-11-25 08:01:14 +11:00
4b9d242be5
Merge branch 'master' into blender2.8
2018-11-22 15:16:45 +11:00
968bf0df14
Fix T57811: Render crashes in certain scenes when AO Bounces are used
2018-11-21 14:17:26 +01:00
6f48bfc7a8
Cycles: Cleanup, use utility function
...
Replaces inlined platform-specific code.
2018-11-21 13:51:18 +01:00
65143542af
Cycles: Cleanup, reduce indentation level
2018-11-21 12:41:24 +01:00
700330afe8
Cycles: Cleanup, comments and dead code
2018-11-21 11:33:11 +01:00
65d01def80
Cycles: Cleanup, CUDA code path is not possible inside AVX2
2018-11-21 11:28:49 +01:00
c617fcad10
Merge branch 'master' into blender2.8
2018-11-15 17:17:37 +01:00
cd9ab9d99e
Cycles: Cleanup, code style
2018-11-15 17:16:40 +01:00
8d07af5d10
Merge branch 'master' into blender2.8
2018-11-09 17:56:28 +01:00
65e9388440
Revert "Cycles: Cleanup, move Embree BVH logic to own file"
...
While we shouldn't have logic in an entry point, and since one should
not be making typos when moving lines around, there is bigger entanglement
issue with BVH host code using kernel function. This is bad violation,
but is tricky to get solved moments before the weekly.
In order to keep things in a (less) broken state than before own cleanup
reverting the changes.
This reverts commit 2bad10be96ddabb21d05
2018-11-09 17:54:09 +01:00
78a6689aea
Merge branch 'master' into blender2.8
2018-11-09 14:34:33 +01:00
ddabb21d05
Cycles; Cleanup, line length
...
There are some more sanitization which would be cool to be done
in the neighbourhood of those functions, but that could also happen
later.
2018-11-09 12:31:46 +01:00
2bad10be96
Cycles: Cleanup, move Embree BVH logic to own file
...
There is no way we can keep generic entry point functions easy to
follow if we start adding actual logic in them.
2018-11-09 12:28:55 +01:00
2d98b198e9
Cycles: Cleanup, indentation in preprocessor
2018-11-09 12:12:11 +01:00
3e76cc494a
Cycles: Cleanup, indentation
2018-11-09 12:10:48 +01:00
203de0bbf0
Cycles: Cleanup, space after (void)
...
It was used in like 95% of places.
2018-11-09 12:08:51 +01:00
cb4b5e12ab
Cycles: Cleanup, spacing after preprocessor
...
It is supposed to be two spaces before comment stating which if
else/endif statements corresponds to. Was mainly violated in the
header guards.
2018-11-09 11:34:54 +01:00
146b39a45d
Merge branch 'master' into blender2.8
2018-11-08 15:15:29 +01:00
116be3deff
Fix build on 32bit after Embree changes.
2018-11-08 14:58:01 +01:00
Stefan Werner
85a9744905
Merge branch 'master' into blender2.8
2018-11-07 20:44:40 +01:00
Stefan Werner
d3320c5488
Cycles: Rearranged macros in kernel_types.h to fix Embree build.
2018-11-07 15:20:24 +01:00
4610ca599a
Merge branch 'master' into blender2.8
2018-11-07 14:54:32 +01:00
33201a48b0
Fix build with OSL, remove unneeded file after Embree changes.
2018-11-07 14:38:07 +01:00
Stefan Werner
9d0eac6ba5
Merge branch 'master' into blender2.8
2018-11-07 14:30:09 +01:00
