[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52030] trunk/blender: Cycles: persistent images option
Sergey Sharybin
sergey.vfx at gmail.com
Fri Nov 9 09:47:00 CET 2012
Revision: 52030
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52030
Author: nazgul
Date: 2012-11-09 08:46:53 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Cycles: persistent images option
This option enables keeping loaded images in the memory in-between
of rendering.
Implemented by keeping render engine alive for until Render structure
is being freed.
Cycles will free all data when render finishes, optionally keeping
image manager untouched. All shaders, meshes, objects will be
re-allocated next time rendering happens.
Cycles cession and scene will be re-created from scratch if render/
scene parameters were changed.
This will also allow to keep compiled OSL shaders in memory without
need to re-compile them again.
P.S. Performance panel could be cleaned up a bit, not so much happy
with it's vertical alignment currently but not sure how to make
it look better.
P.P.S. Currently the only way to free images from the device is to
disable Persistent Images option and start rendering.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/__init__.py
trunk/blender/intern/cycles/blender/addon/engine.py
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/blender/blender_python.cpp
trunk/blender/intern/cycles/blender/blender_session.cpp
trunk/blender/intern/cycles/blender/blender_session.h
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/render/scene.cpp
trunk/blender/intern/cycles/render/scene.h
trunk/blender/intern/cycles/render/session.cpp
trunk/blender/intern/cycles/render/session.h
trunk/blender/intern/cycles/util/util_progress.h
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/render/intern/source/external_engine.c
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/__init__.py 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/blender/addon/__init__.py 2012-11-09 08:46:53 UTC (rev 52030)
@@ -48,7 +48,11 @@
# final render
def update(self, data, scene):
- engine.create(self, data, scene)
+ if not self.session:
+ engine.create(self, data, scene)
+ else:
+ engine.reset(self, data, scene)
+
engine.update(self, data, scene)
def render(self, scene):
Modified: trunk/blender/intern/cycles/blender/addon/engine.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/engine.py 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/blender/addon/engine.py 2012-11-09 08:46:53 UTC (rev 52030)
@@ -61,6 +61,13 @@
_cycles.render(engine.session)
+def reset(engine, data, scene):
+ import _cycles
+ data = data.as_pointer()
+ scene = scene.as_pointer()
+ _cycles.reset(engine.session, data, scene)
+
+
def update(engine, data, scene):
import _cycles
_cycles.sync(engine.session)
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2012-11-09 08:46:53 UTC (rev 52030)
@@ -297,6 +297,12 @@
default=False,
)
+ cls.use_persistent_images = BoolProperty(
+ name="Persistent Images",
+ description="Keep images loaded on the device so they could be reused by next render",
+ default=False,
+ )
+
@classmethod
def unregister(cls):
del bpy.types.Scene.cycles
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2012-11-09 08:46:53 UTC (rev 52030)
@@ -216,7 +216,11 @@
sub.label(text="Viewport:")
sub.prop(cscene, "preview_start_resolution")
+ sub = col.column(align=True)
+ sub.label(text="Final Render:")
+ sub.prop(cscene, "use_persistent_images")
+
class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
bl_label = "Layers"
bl_options = {'DEFAULT_CLOSED'}
Modified: trunk/blender/intern/cycles/blender/blender_python.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_python.cpp 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/blender/blender_python.cpp 2012-11-09 08:46:53 UTC (rev 52030)
@@ -146,6 +146,32 @@
Py_RETURN_NONE;
}
+static PyObject *reset_func(PyObject *self, PyObject *args)
+{
+ PyObject *pysession, *pydata, *pyscene;
+
+ if(!PyArg_ParseTuple(args, "OOO", &pysession, &pydata, &pyscene))
+ return NULL;
+
+ BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
+
+ PointerRNA dataptr;
+ RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pydata), &dataptr);
+ BL::BlendData b_data(dataptr);
+
+ PointerRNA sceneptr;
+ RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyscene), &sceneptr);
+ BL::Scene b_scene(sceneptr);
+
+ Py_BEGIN_ALLOW_THREADS
+
+ session->reset_session(b_data, b_scene);
+
+ Py_END_ALLOW_THREADS
+
+ Py_RETURN_NONE;
+}
+
static PyObject *sync_func(PyObject *self, PyObject *value)
{
Py_BEGIN_ALLOW_THREADS
@@ -352,6 +378,7 @@
{"render", render_func, METH_O, ""},
{"draw", draw_func, METH_VARARGS, ""},
{"sync", sync_func, METH_O, ""},
+ {"reset", reset_func, METH_VARARGS, ""},
#ifdef WITH_OSL
{"osl_update_node", osl_update_node_func, METH_VARARGS, ""},
{"osl_compile", osl_compile_func, METH_VARARGS, ""},
Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp 2012-11-09 08:46:53 UTC (rev 52030)
@@ -109,9 +109,50 @@
session->reset(buffer_params, session_params.samples);
}
+void BlenderSession::reset_session(BL::BlendData b_data_, BL::Scene b_scene_)
+{
+ b_data = b_data_;
+ b_scene = b_scene_;
+
+ SceneParams scene_params = BlenderSync::get_scene_params(b_scene, background);
+ SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
+
+ if(scene->params.modified(scene_params) ||
+ session->params.modified(session_params))
+ {
+ /* if scene or session parameters changed, it's easier to simply re-create
+ * them rather than trying to distinguish which settings need to be updated
+ */
+
+ delete session;
+
+ create_session();
+
+ return;
+ }
+
+ session->progress.reset();
+ scene->reset();
+
+ /* peak memory usage should show current render peak, not peak for all renders
+ * made by this render session
+ */
+ session->stats.mem_peak = session->stats.mem_used;
+
+ /* sync object should be re-created */
+ sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress);
+ sync->sync_data(b_v3d, b_engine.camera_override());
+ sync->sync_camera(b_engine.camera_override(), width, height);
+
+ BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, PointerRNA_NULL, PointerRNA_NULL, scene->camera, width, height);
+ session->reset(buffer_params, session_params.samples);
+}
+
void BlenderSession::free_session()
{
- delete sync;
+ if(sync)
+ delete sync;
+
delete session;
}
@@ -304,6 +345,15 @@
/* clear callback */
session->write_render_tile_cb = NULL;
session->update_render_tile_cb = NULL;
+
+ /* free all memory used (host and device), so we wouldn't leave render
+ * engine with extra memory allocated
+ */
+
+ session->device_free();
+
+ delete sync;
+ sync = NULL;
}
void BlenderSession::do_write_update_render_result(BL::RenderResult b_rr, BL::RenderLayer b_rlay, RenderTile& rtile, bool do_update_only)
Modified: trunk/blender/intern/cycles/blender/blender_session.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.h 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/blender/blender_session.h 2012-11-09 08:46:53 UTC (rev 52030)
@@ -46,6 +46,8 @@
void create_session();
void free_session();
+ void reset_session(BL::BlendData b_data, BL::Scene b_scene);
+
/* offline render */
void render();
Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-11-09 08:46:53 UTC (rev 52030)
@@ -294,6 +294,8 @@
params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits");
params.use_bvh_cache = (background)? RNA_boolean_get(&cscene, "use_cache"): false;
+ params.persistent_images = (background)? RNA_boolean_get(&cscene, "use_persistent_images"): false;
+
return params;
}
Modified: trunk/blender/intern/cycles/render/scene.cpp
===================================================================
--- trunk/blender/intern/cycles/render/scene.cpp 2012-11-09 08:28:14 UTC (rev 52029)
+++ trunk/blender/intern/cycles/render/scene.cpp 2012-11-09 08:46:53 UTC (rev 52030)
@@ -62,33 +62,11 @@
Scene::~Scene()
{
- if(device) camera->device_free(device, &dscene);
- delete camera;
+ free_memory(true);
+}
- if(device) filter->device_free(device, &dscene);
- delete filter;
-
- if(device) film->device_free(device, &dscene);
- delete film;
-
- if(device) background->device_free(device, &dscene);
- delete background;
-
- if(device) mesh_manager->device_free(device, &dscene);
- delete mesh_manager;
-
- if(device) object_manager->device_free(device, &dscene);
- delete object_manager;
-
- if(device) integrator->device_free(device, &dscene);
- delete integrator;
-
- if(device) shader_manager->device_free(device, &dscene);
- delete shader_manager;
-
- if(device) light_manager->device_free(device, &dscene);
- delete light_manager;
-
+void Scene::free_memory(bool final)
+{
foreach(Shader *s, shaders)
delete s;
foreach(Mesh *m, meshes)
@@ -100,11 +78,44 @@
foreach(ParticleSystem *p, particle_systems)
delete p;
- if(device) image_manager->device_free(device, &dscene);
- delete image_manager;
+ if(device) {
+ camera->device_free(device, &dscene);
+ filter->device_free(device, &dscene);
+ film->device_free(device, &dscene);
+ background->device_free(device, &dscene);
+ integrator->device_free(device, &dscene);
- if(device) particle_system_manager->device_free(device, &dscene);
- delete particle_system_manager;
+ object_manager->device_free(device, &dscene);
+ mesh_manager->device_free(device, &dscene);
+ shader_manager->device_free(device, &dscene);
+ light_manager->device_free(device, &dscene);
+
+ particle_system_manager->device_free(device, &dscene);
+
+ if(!params.persistent_images || final)
+ image_manager->device_free(device, &dscene);
+ }
+
+ if(final) {
+ delete filter;
+ delete camera;
+ delete film;
+ delete background;
+ delete integrator;
+ delete object_manager;
+ delete mesh_manager;
+ delete shader_manager;
+ delete light_manager;
+ delete particle_system_manager;
+ delete image_manager;
+ }
+ else {
+ shaders.clear();
+ meshes.clear();
+ objects.clear();
+ lights.clear();
+ particle_systems.clear();
+ }
}
void Scene::device_update(Device *device_, Progress& progress)
@@ -229,5 +240,22 @@
|| particle_system_manager->need_update);
}
+void Scene::reset()
+{
+ shader_manager->add_default(this);
+
+ /* ensure all objects are updated */
+ camera->tag_update();
+ filter->tag_update(this);
+ film->tag_update(this);
+ background->tag_update(this);
+ integrator->tag_update(this);
+}
+
+void Scene::device_free()
+{
+ free_memory(false);
+}
+
CCL_NAMESPACE_END
Modified: trunk/blender/intern/cycles/render/scene.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list