[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59718] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sun Sep 1 20:20:00 CEST 2013
Revision: 59718
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59718
Author: gdh
Date: 2013-09-01 18:19:59 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59694 to r59717.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59694
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59717
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/atomic/atomic_ops.h
branches/soc-2013-cycles_mblur/intern/cycles/SConscript
branches/soc-2013-cycles_mblur/intern/cycles/blender/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
branches/soc-2013-cycles_mblur/intern/cycles/render/integrator.cpp
branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mmap_win.c
branches/soc-2013-cycles_mblur/intern/guardedalloc/mmap_win.h
branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_idprop.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_lamp.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_library.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_report.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_dynstr.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_endian_switch.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_jitter.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_lasso.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_smallhash.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/gsqueue.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/lasso.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/quadric.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/rand.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_inline.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_interface.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_view.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/intern/SConscript
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_access.h
branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_api.h
branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_types.h
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_compiler_attrs.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_strict_flags.h
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59693
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59717
Modified: branches/soc-2013-cycles_mblur/intern/atomic/atomic_ops.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/atomic/atomic_ops.h 2013-09-01 15:58:53 UTC (rev 59717)
+++ branches/soc-2013-cycles_mblur/intern/atomic/atomic_ops.h 2013-09-01 18:19:59 UTC (rev 59718)
@@ -91,13 +91,13 @@
ATOMIC_INLINE uint64_t
atomic_add_uint64(uint64_t *p, uint64_t x)
{
- return (OSAtomicAdd64((int64_t)x, (int64_t *)p));
+ return (uint64_t)(OSAtomicAdd64((int64_t)x, (int64_t *)p));
}
ATOMIC_INLINE uint64_t
atomic_sub_uint64(uint64_t *p, uint64_t x)
{
- return (OSAtomicAdd64(-((int64_t)x), (int64_t *)p));
+ return (uint64_t)(OSAtomicAdd64(-((int64_t)x), (int64_t *)p));
}
# elif (defined(__amd64__) || defined(__x86_64__))
ATOMIC_INLINE uint64_t
@@ -189,13 +189,13 @@
ATOMIC_INLINE uint32_t
atomic_add_uint32(uint32_t *p, uint32_t x)
{
- return (OSAtomicAdd32((int32_t)x, (int32_t *)p));
+ return (uint32_t)(OSAtomicAdd32((int32_t)x, (int32_t *)p));
}
ATOMIC_INLINE uint32_t
atomic_sub_uint32(uint32_t *p, uint32_t x)
{
- return (OSAtomicAdd32(-((int32_t)x), (int32_t *)p));
+ return (uint32_t)(OSAtomicAdd32(-((int32_t)x), (int32_t *)p));
}
#elif (defined(__i386__) || defined(__amd64__) || defined(__x86_64__))
ATOMIC_INLINE uint32_t
Modified: branches/soc-2013-cycles_mblur/intern/cycles/SConscript
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/SConscript 2013-09-01 15:58:53 UTC (rev 59717)
+++ branches/soc-2013-cycles_mblur/intern/cycles/SConscript 2013-09-01 18:19:59 UTC (rev 59718)
@@ -57,7 +57,7 @@
incs.append(cycles['BF_OSL_INC'])
incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
-incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split())
+incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna #source/blender/blenlib'.split())
incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split())
incs.extend('#extern/glew/include #intern/mikktspace'.split())
incs.append(cycles['BF_OIIO_INC'])
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/CMakeLists.txt 2013-09-01 15:58:53 UTC (rev 59717)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/CMakeLists.txt 2013-09-01 18:19:59 UTC (rev 59718)
@@ -10,6 +10,7 @@
../../mikktspace
../../../source/blender/makesdna
../../../source/blender/makesrna
+ ../../../source/blender/blenlib
${CMAKE_BINARY_DIR}/source/blender/makesrna/intern
)
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h 2013-09-01 15:58:53 UTC (rev 59717)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h 2013-09-01 18:19:59 UTC (rev 59718)
@@ -791,10 +791,10 @@
hit_state.flag |= PATH_RAY_BSSRDF_ANCESTOR;
if(kernel_path_integrate_lighting(kg, rng, sample, num_samples, &bssrdf_sd[hit],
- &tp, &hit_min_ray_pdf, &hit_ray_pdf, &hit_state, rng_offset, &L, &hit_ray, &hit_ray_t)) {
+ &tp, &hit_min_ray_pdf, &hit_ray_pdf, &hit_state, rng_offset+PRNG_BOUNCE_NUM, &L, &hit_ray, &hit_ray_t)) {
kernel_path_indirect(kg, rng, sample, hit_ray, buffer,
tp, num_samples, num_samples,
- hit_min_ray_pdf, hit_ray_pdf, hit_state, rng_offset+PRNG_BOUNCE_NUM, &L);
+ hit_min_ray_pdf, hit_ray_pdf, hit_state, rng_offset+PRNG_BOUNCE_NUM*2, &L);
/* for render passes, sum and reset indirect light pass variables
* for the next samples */
@@ -1265,7 +1265,7 @@
kernel_branched_path_integrate_lighting(kg, rng, sample*num_samples + j,
aa_samples*num_samples,
&bssrdf_sd[hit], throughput, num_samples_inv,
- ray_pdf, ray_pdf, state, rng_offset, &L, buffer);
+ ray_pdf, ray_pdf, state, rng_offset+PRNG_BOUNCE_NUM, &L, buffer);
}
}
Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/integrator.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/integrator.cpp 2013-09-01 15:58:53 UTC (rev 59717)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/integrator.cpp 2013-09-01 18:19:59 UTC (rev 59718)
@@ -126,7 +126,7 @@
max_samples = max(max_samples, max(ao_samples, max(mesh_light_samples, subsurface_samples)));
}
- max_samples *= (max_bounce + transparent_max_bounce + 2);
+ max_samples *= (max_bounce + transparent_max_bounce + 3);
int dimensions = PRNG_BASE_NUM + max_samples*PRNG_BOUNCE_NUM;
dimensions = min(dimensions, SOBOL_MAX_DIMENSIONS);
Modified: branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h 2013-09-01 15:58:53 UTC (rev 59717)
+++ branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h 2013-09-01 18:19:59 UTC (rev 59718)
@@ -190,7 +190,7 @@
* Are the start/end block markers still correct ?
*
* @retval 0 for correct memory, 1 for corrupted memory. */
- int MEM_check_memory_integrity(void);
+ bool MEM_check_memory_integrity(void);
/** Set thread locking functions for safe memory allocation from multiple
* threads, pass NULL pointers to disable thread locking again. */
@@ -207,13 +207,13 @@
/** Get mapped memory usage. */
uintptr_t MEM_get_mapped_memory_in_use(void);
/** Get amount of memory blocks in use. */
- int MEM_get_memory_blocks_in_use(void);
+ unsigned int MEM_get_memory_blocks_in_use(void);
/** Reset the peak memory statistic to zero. */
void MEM_reset_peak_memory(void);
/** Get the peak memory usage in bytes, including mmap allocations. */
- uintptr_t MEM_get_peak_memory(void)
+ size_t MEM_get_peak_memory(void)
#if MEM_GNU_ATTRIBUTES
__attribute__((warn_unused_result))
#endif
Modified: branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn.c 2013-09-01 15:58:53 UTC (rev 59717)
+++ branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn.c 2013-09-01 18:19:59 UTC (rev 59718)
@@ -37,6 +37,9 @@
#include <stdarg.h>
#include <sys/types.h>
+/* to ensure strict conversions */
+#include "../../source/blender/blenlib/BLI_strict_flags.h"
+
/* mmap exception */
#if defined(WIN32)
# include "mmap_win.h"
@@ -61,15 +64,6 @@
#include "atomic_ops.h"
-/* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */
-#if defined(WIN64)
-# define SIZET_FORMAT "%I64u"
-# define SIZET_ARG(a) ((unsigned long long)(a))
-#else
-# define SIZET_FORMAT "%lu"
-# define SIZET_ARG(a) ((unsigned long)(a))
-#endif
-
/* Only for debugging:
* store original buffer's name when doing MEM_dupallocN
* helpful to profile issues with non-freed "dup_alloc" buffers,
@@ -118,6 +112,18 @@
}
#endif
+/* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */
+#if defined(WIN64)
+# define SIZET_FORMAT "%I64u"
+# define SIZET_ARG(a) ((unsigned long long)(a))
+#else
+# define SIZET_FORMAT "%lu"
+# define SIZET_ARG(a) ((unsigned long)(a))
+#endif
+
+#define SIZET_ALIGN_4(len) ((len + 3) & ~(size_t)3)
+
+
/* --------------------------------------------------------------------- */
/* Data definition */
/* --------------------------------------------------------------------- */
@@ -227,7 +233,7 @@
static void (*thread_lock_callback)(void) = NULL;
static void (*thread_unlock_callback)(void) = NULL;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list