diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 21:49:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 21:49:22 +0400 |
| commit | d828d44d7a934e6e9c8fb492c8f788e91fda16ff (patch) | |
| tree | d9ae1cf32ab6d26d2d663ca1611ac7036485bb98 /intern/cycles/kernel/osl/osl_services.cpp | |
| parent | dc13969e484ed9fa6834b1aba85ba00f65bf8a11 (diff) | |
Cycles: use LIKELY/UNLIKELY macros
Gives overall ~3% speedup in own tests for BMW scene.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 2984cc97437..f33d032b9d3 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -50,7 +50,11 @@ CCL_NAMESPACE_BEGIN /* RenderServices implementation */ -#define COPY_MATRIX44(m1, m2) memcpy(m1, m2, sizeof(*m2)) +#define COPY_MATRIX44(m1, m2) { \ + CHECK_TYPE(m1, OSL::Matrix44*); \ + CHECK_TYPE(m2, Transform*); \ + memcpy(m1, m2, sizeof(*m2)); \ +} (void)0 /* static ustrings */ ustring OSLRenderServices::u_distance("distance"); |