2011-04-27 11:58:34 +00:00
|
|
|
/*
|
2013-08-18 14:16:15 +00:00
|
|
|
* Copyright 2011-2013 Blender Foundation
|
2011-04-27 11:58:34 +00:00
|
|
|
*
|
2013-08-18 14:16:15 +00:00
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
2011-04-27 11:58:34 +00:00
|
|
|
*
|
2013-08-18 14:16:15 +00:00
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
2011-04-27 11:58:34 +00:00
|
|
|
*
|
2013-08-18 14:16:15 +00:00
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
2014-12-25 02:50:24 +01:00
|
|
|
* limitations under the License.
|
2011-04-27 11:58:34 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <Python.h>
|
|
|
|
|
Cycles: Make all #include statements relative to cycles source directory
The idea is to make include statements more explicit and obvious where the
file is coming from, additionally reducing chance of wrong header being
picked up.
For example, it was not obvious whether bvh.h was refferring to builder
or traversal, whenter node.h is a generic graph node or a shader node
and cases like that.
Surely this might look obvious for the active developers, but after some
time of not touching the code it becomes less obvious where file is coming
from.
This was briefly mentioned in T50824 and seems @brecht is fine with such
explicitness, but need to agree with all active developers before committing
this.
Please note that this patch is lacking changes related on GPU/OpenCL
support. This will be solved if/when we all agree this is a good idea to move
forward.
Reviewers: brecht, lukasstockner97, maiself, nirved, dingto, juicyfruit, swerner
Reviewed By: lukasstockner97, maiself, nirved, dingto
Subscribers: brecht
Differential Revision: https://developer.blender.org/D2586
2017-03-28 20:39:14 +02:00
|
|
|
#include "blender/CCL_api.h"
|
2012-01-09 16:58:01 +00:00
|
|
|
|
Cycles: Make all #include statements relative to cycles source directory
The idea is to make include statements more explicit and obvious where the
file is coming from, additionally reducing chance of wrong header being
picked up.
For example, it was not obvious whether bvh.h was refferring to builder
or traversal, whenter node.h is a generic graph node or a shader node
and cases like that.
Surely this might look obvious for the active developers, but after some
time of not touching the code it becomes less obvious where file is coming
from.
This was briefly mentioned in T50824 and seems @brecht is fine with such
explicitness, but need to agree with all active developers before committing
this.
Please note that this patch is lacking changes related on GPU/OpenCL
support. This will be solved if/when we all agree this is a good idea to move
forward.
Reviewers: brecht, lukasstockner97, maiself, nirved, dingto, juicyfruit, swerner
Reviewed By: lukasstockner97, maiself, nirved, dingto
Subscribers: brecht
Differential Revision: https://developer.blender.org/D2586
2017-03-28 20:39:14 +02:00
|
|
|
#include "blender/blender_sync.h"
|
|
|
|
#include "blender/blender_session.h"
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2018-01-19 14:55:53 +01:00
|
|
|
#include "util/util_debug.h"
|
Cycles: Make all #include statements relative to cycles source directory
The idea is to make include statements more explicit and obvious where the
file is coming from, additionally reducing chance of wrong header being
picked up.
For example, it was not obvious whether bvh.h was refferring to builder
or traversal, whenter node.h is a generic graph node or a shader node
and cases like that.
Surely this might look obvious for the active developers, but after some
time of not touching the code it becomes less obvious where file is coming
from.
This was briefly mentioned in T50824 and seems @brecht is fine with such
explicitness, but need to agree with all active developers before committing
this.
Please note that this patch is lacking changes related on GPU/OpenCL
support. This will be solved if/when we all agree this is a good idea to move
forward.
Reviewers: brecht, lukasstockner97, maiself, nirved, dingto, juicyfruit, swerner
Reviewed By: lukasstockner97, maiself, nirved, dingto
Subscribers: brecht
Differential Revision: https://developer.blender.org/D2586
2017-03-28 20:39:14 +02:00
|
|
|
#include "util/util_foreach.h"
|
|
|
|
#include "util/util_logging.h"
|
|
|
|
#include "util/util_md5.h"
|
|
|
|
#include "util/util_opengl.h"
|
|
|
|
#include "util/util_path.h"
|
|
|
|
#include "util/util_string.h"
|
|
|
|
#include "util/util_types.h"
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2012-11-03 14:32:35 +00:00
|
|
|
#ifdef WITH_OSL
|
Cycles: Make all #include statements relative to cycles source directory
The idea is to make include statements more explicit and obvious where the
file is coming from, additionally reducing chance of wrong header being
picked up.
For example, it was not obvious whether bvh.h was refferring to builder
or traversal, whenter node.h is a generic graph node or a shader node
and cases like that.
Surely this might look obvious for the active developers, but after some
time of not touching the code it becomes less obvious where file is coming
from.
This was briefly mentioned in T50824 and seems @brecht is fine with such
explicitness, but need to agree with all active developers before committing
this.
Please note that this patch is lacking changes related on GPU/OpenCL
support. This will be solved if/when we all agree this is a good idea to move
forward.
Reviewers: brecht, lukasstockner97, maiself, nirved, dingto, juicyfruit, swerner
Reviewed By: lukasstockner97, maiself, nirved, dingto
Subscribers: brecht
Differential Revision: https://developer.blender.org/D2586
2017-03-28 20:39:14 +02:00
|
|
|
#include "render/osl.h"
|
2012-11-03 14:32:35 +00:00
|
|
|
|
|
|
|
#include <OSL/oslquery.h>
|
|
|
|
#include <OSL/oslconfig.h>
|
|
|
|
#endif
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
|
2016-01-12 16:00:48 +05:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
/* Flag describing whether debug flags were synchronized from scene. */
|
|
|
|
bool debug_flags_set = false;
|
|
|
|
|
|
|
|
void *pylong_as_voidptr_typesafe(PyObject *object)
|
2014-07-01 15:43:37 +06:00
|
|
|
{
|
|
|
|
if(object == Py_None)
|
|
|
|
return NULL;
|
|
|
|
return PyLong_AsVoidPtr(object);
|
|
|
|
}
|
|
|
|
|
2016-01-12 16:00:48 +05:00
|
|
|
/* Synchronize debug flags from a given Blender scene.
|
|
|
|
* Return truth when device list needs invalidation.
|
|
|
|
*/
|
|
|
|
bool debug_flags_sync_from_scene(BL::Scene b_scene)
|
|
|
|
{
|
|
|
|
DebugFlagsRef flags = DebugFlags();
|
|
|
|
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
|
|
|
|
/* Backup some settings for comparison. */
|
|
|
|
DebugFlags::OpenCL::DeviceType opencl_device_type = flags.opencl.device_type;
|
|
|
|
DebugFlags::OpenCL::KernelType opencl_kernel_type = flags.opencl.kernel_type;
|
2017-08-21 15:09:03 +02:00
|
|
|
/* Synchronize shared flags. */
|
|
|
|
flags.viewport_static_bvh = get_enum(cscene, "debug_bvh_type");
|
2016-01-12 16:00:48 +05:00
|
|
|
/* Synchronize CPU flags. */
|
|
|
|
flags.cpu.avx2 = get_boolean(cscene, "debug_use_cpu_avx2");
|
|
|
|
flags.cpu.avx = get_boolean(cscene, "debug_use_cpu_avx");
|
|
|
|
flags.cpu.sse41 = get_boolean(cscene, "debug_use_cpu_sse41");
|
|
|
|
flags.cpu.sse3 = get_boolean(cscene, "debug_use_cpu_sse3");
|
|
|
|
flags.cpu.sse2 = get_boolean(cscene, "debug_use_cpu_sse2");
|
2018-01-19 10:59:58 +01:00
|
|
|
flags.cpu.bvh_layout = (BVHLayout)get_enum(cscene, "debug_bvh_layout");
|
2017-02-14 06:20:48 -05:00
|
|
|
flags.cpu.split_kernel = get_boolean(cscene, "debug_use_cpu_split_kernel");
|
2016-05-06 22:34:15 +02:00
|
|
|
/* Synchronize CUDA flags. */
|
|
|
|
flags.cuda.adaptive_compile = get_boolean(cscene, "debug_use_cuda_adaptive_compile");
|
2017-02-14 05:50:29 -05:00
|
|
|
flags.cuda.split_kernel = get_boolean(cscene, "debug_use_cuda_split_kernel");
|
2016-01-12 16:00:48 +05:00
|
|
|
/* Synchronize OpenCL kernel type. */
|
|
|
|
switch(get_enum(cscene, "debug_opencl_kernel_type")) {
|
|
|
|
case 0:
|
|
|
|
flags.opencl.kernel_type = DebugFlags::OpenCL::KERNEL_DEFAULT;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
flags.opencl.kernel_type = DebugFlags::OpenCL::KERNEL_MEGA;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
flags.opencl.kernel_type = DebugFlags::OpenCL::KERNEL_SPLIT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Synchronize OpenCL device type. */
|
|
|
|
switch(get_enum(cscene, "debug_opencl_device_type")) {
|
|
|
|
case 0:
|
|
|
|
flags.opencl.device_type = DebugFlags::OpenCL::DEVICE_NONE;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
flags.opencl.device_type = DebugFlags::OpenCL::DEVICE_ALL;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
flags.opencl.device_type = DebugFlags::OpenCL::DEVICE_DEFAULT;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
flags.opencl.device_type = DebugFlags::OpenCL::DEVICE_CPU;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
flags.opencl.device_type = DebugFlags::OpenCL::DEVICE_GPU;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
flags.opencl.device_type = DebugFlags::OpenCL::DEVICE_ACCELERATOR;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Synchronize other OpenCL flags. */
|
|
|
|
flags.opencl.debug = get_boolean(cscene, "debug_use_opencl_debug");
|
2017-07-05 20:16:41 -04:00
|
|
|
flags.opencl.mem_limit = ((size_t)get_int(cscene, "debug_opencl_mem_limit"))*1024*1024;
|
2017-03-08 17:56:06 +01:00
|
|
|
flags.opencl.single_program = get_boolean(cscene, "debug_opencl_kernel_single_program");
|
2016-01-12 16:00:48 +05:00
|
|
|
return flags.opencl.device_type != opencl_device_type ||
|
|
|
|
flags.opencl.kernel_type != opencl_kernel_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reset debug flags to default values.
|
|
|
|
* Return truth when device list needs invalidation.
|
|
|
|
*/
|
|
|
|
bool debug_flags_reset()
|
|
|
|
{
|
|
|
|
DebugFlagsRef flags = DebugFlags();
|
|
|
|
/* Backup some settings for comparison. */
|
|
|
|
DebugFlags::OpenCL::DeviceType opencl_device_type = flags.opencl.device_type;
|
|
|
|
DebugFlags::OpenCL::KernelType opencl_kernel_type = flags.opencl.kernel_type;
|
|
|
|
flags.reset();
|
|
|
|
return flags.opencl.device_type != opencl_device_type ||
|
|
|
|
flags.opencl.kernel_type != opencl_kernel_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
} /* namespace */
|
|
|
|
|
2014-02-12 23:13:45 +01:00
|
|
|
void python_thread_state_save(void **python_thread_state)
|
2014-02-12 21:49:34 +01:00
|
|
|
{
|
2014-02-12 23:13:45 +01:00
|
|
|
*python_thread_state = (void*)PyEval_SaveThread();
|
2014-02-12 21:49:34 +01:00
|
|
|
}
|
|
|
|
|
2014-02-12 23:13:45 +01:00
|
|
|
void python_thread_state_restore(void **python_thread_state)
|
2014-02-12 21:49:34 +01:00
|
|
|
{
|
2014-02-12 23:13:45 +01:00
|
|
|
PyEval_RestoreThread((PyThreadState*)*python_thread_state);
|
|
|
|
*python_thread_state = NULL;
|
2014-02-12 21:49:34 +01:00
|
|
|
}
|
|
|
|
|
2014-10-14 14:53:49 +02:00
|
|
|
static const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce)
|
|
|
|
{
|
2016-03-23 13:58:31 +01:00
|
|
|
const char *result = _PyUnicode_AsString(py_str);
|
|
|
|
if(result) {
|
|
|
|
/* 99% of the time this is enough but we better support non unicode
|
|
|
|
* chars since blender doesnt limit this.
|
|
|
|
*/
|
|
|
|
return result;
|
2014-10-14 14:53:49 +02:00
|
|
|
}
|
2016-03-23 13:58:31 +01:00
|
|
|
else {
|
|
|
|
PyErr_Clear();
|
|
|
|
if(PyBytes_Check(py_str)) {
|
|
|
|
return PyBytes_AS_STRING(py_str);
|
|
|
|
}
|
|
|
|
else if((*coerce = PyUnicode_EncodeFSDefault(py_str))) {
|
|
|
|
return PyBytes_AS_STRING(*coerce);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Clear the error, so Cycles can be at leadt used without
|
|
|
|
* GPU and OSL support,
|
|
|
|
*/
|
|
|
|
PyErr_Clear();
|
|
|
|
return "";
|
|
|
|
}
|
2014-10-14 14:53:49 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *init_func(PyObject * /*self*/, PyObject *args)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2014-10-14 14:53:49 +02:00
|
|
|
PyObject *path, *user_path;
|
2015-02-18 21:16:52 +05:00
|
|
|
int headless;
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2015-02-18 21:16:52 +05:00
|
|
|
if(!PyArg_ParseTuple(args, "OOi", &path, &user_path, &headless)) {
|
2011-04-27 11:58:34 +00:00
|
|
|
return NULL;
|
2014-10-14 14:53:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *path_coerce = NULL, *user_path_coerce = NULL;
|
|
|
|
path_init(PyC_UnicodeAsByte(path, &path_coerce),
|
|
|
|
PyC_UnicodeAsByte(user_path, &user_path_coerce));
|
|
|
|
Py_XDECREF(path_coerce);
|
|
|
|
Py_XDECREF(user_path_coerce);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2015-02-18 21:16:52 +05:00
|
|
|
BlenderSession::headless = headless;
|
|
|
|
|
2016-01-12 16:00:48 +05:00
|
|
|
VLOG(2) << "Debug flags initialized to:\n"
|
|
|
|
<< DebugFlags();
|
|
|
|
|
2011-12-24 02:47:13 +00:00
|
|
|
Py_RETURN_NONE;
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
2016-02-07 03:40:41 +05:00
|
|
|
|
|
|
|
static PyObject *exit_func(PyObject * /*self*/, PyObject * /*args*/)
|
|
|
|
{
|
|
|
|
ShaderManager::free_memory();
|
|
|
|
TaskScheduler::free_memory();
|
|
|
|
Device::free_memory();
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *create_func(PyObject * /*self*/, PyObject *args)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2012-01-09 16:58:01 +00:00
|
|
|
PyObject *pyengine, *pyuserpref, *pydata, *pyscene, *pyregion, *pyv3d, *pyrv3d;
|
2015-02-18 21:16:52 +05:00
|
|
|
int preview_osl;
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2015-02-18 21:16:52 +05:00
|
|
|
if(!PyArg_ParseTuple(args, "OOOOOOOi", &pyengine, &pyuserpref, &pydata, &pyscene,
|
|
|
|
&pyregion, &pyv3d, &pyrv3d, &preview_osl))
|
2015-02-11 01:02:36 +05:00
|
|
|
{
|
2011-04-27 11:58:34 +00:00
|
|
|
return NULL;
|
2015-02-11 01:02:36 +05:00
|
|
|
}
|
2011-04-27 11:58:34 +00:00
|
|
|
|
|
|
|
/* RNA */
|
|
|
|
PointerRNA engineptr;
|
2011-05-05 13:51:33 +00:00
|
|
|
RNA_pointer_create(NULL, &RNA_RenderEngine, (void*)PyLong_AsVoidPtr(pyengine), &engineptr);
|
2011-04-27 11:58:34 +00:00
|
|
|
BL::RenderEngine engine(engineptr);
|
|
|
|
|
2012-01-09 16:58:01 +00:00
|
|
|
PointerRNA userprefptr;
|
2013-06-11 12:52:02 +00:00
|
|
|
RNA_pointer_create(NULL, &RNA_UserPreferences, (void*)PyLong_AsVoidPtr(pyuserpref), &userprefptr);
|
2012-01-09 16:58:01 +00:00
|
|
|
BL::UserPreferences userpref(userprefptr);
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
PointerRNA dataptr;
|
2014-12-11 16:55:10 +05:00
|
|
|
RNA_main_pointer_create((Main*)PyLong_AsVoidPtr(pydata), &dataptr);
|
2011-04-27 11:58:34 +00:00
|
|
|
BL::BlendData data(dataptr);
|
|
|
|
|
|
|
|
PointerRNA sceneptr;
|
2011-05-05 13:51:33 +00:00
|
|
|
RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyscene), &sceneptr);
|
2011-04-27 11:58:34 +00:00
|
|
|
BL::Scene scene(sceneptr);
|
|
|
|
|
|
|
|
PointerRNA regionptr;
|
2014-12-11 17:11:23 +05:00
|
|
|
RNA_pointer_create(NULL, &RNA_Region, pylong_as_voidptr_typesafe(pyregion), ®ionptr);
|
2011-04-27 11:58:34 +00:00
|
|
|
BL::Region region(regionptr);
|
|
|
|
|
|
|
|
PointerRNA v3dptr;
|
2014-12-11 17:11:23 +05:00
|
|
|
RNA_pointer_create(NULL, &RNA_SpaceView3D, pylong_as_voidptr_typesafe(pyv3d), &v3dptr);
|
2011-04-27 11:58:34 +00:00
|
|
|
BL::SpaceView3D v3d(v3dptr);
|
|
|
|
|
|
|
|
PointerRNA rv3dptr;
|
2014-12-11 17:11:23 +05:00
|
|
|
RNA_pointer_create(NULL, &RNA_RegionView3D, pylong_as_voidptr_typesafe(pyrv3d), &rv3dptr);
|
2011-04-27 11:58:34 +00:00
|
|
|
BL::RegionView3D rv3d(rv3dptr);
|
|
|
|
|
|
|
|
/* create session */
|
|
|
|
BlenderSession *session;
|
|
|
|
|
|
|
|
if(rv3d) {
|
2013-01-28 17:37:51 +00:00
|
|
|
/* interactive viewport session */
|
2011-04-27 11:58:34 +00:00
|
|
|
int width = region.width();
|
|
|
|
int height = region.height();
|
|
|
|
|
2012-01-09 16:58:01 +00:00
|
|
|
session = new BlenderSession(engine, userpref, data, scene, v3d, rv3d, width, height);
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
else {
|
2013-01-28 17:37:51 +00:00
|
|
|
/* override some settings for preview */
|
|
|
|
if(engine.is_preview()) {
|
|
|
|
PointerRNA cscene = RNA_pointer_get(&sceneptr, "cycles");
|
|
|
|
|
|
|
|
RNA_boolean_set(&cscene, "shading_system", preview_osl);
|
|
|
|
RNA_boolean_set(&cscene, "use_progressive_refine", true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* offline session or preview render */
|
2015-02-18 21:16:52 +05:00
|
|
|
session = new BlenderSession(engine, userpref, data, scene);
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
2012-09-04 13:29:07 +00:00
|
|
|
|
2014-02-12 23:13:45 +01:00
|
|
|
python_thread_state_save(&session->python_thread_state);
|
|
|
|
|
|
|
|
session->create();
|
|
|
|
|
|
|
|
python_thread_state_restore(&session->python_thread_state);
|
2012-09-04 13:29:07 +00:00
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
return PyLong_FromVoidPtr(session);
|
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *free_func(PyObject * /*self*/, PyObject *value)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2011-12-24 02:47:13 +00:00
|
|
|
delete (BlenderSession*)PyLong_AsVoidPtr(value);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-12-24 02:47:13 +00:00
|
|
|
Py_RETURN_NONE;
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *render_func(PyObject * /*self*/, PyObject *value)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2011-12-24 02:47:13 +00:00
|
|
|
BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(value);
|
2014-02-12 23:13:45 +01:00
|
|
|
|
|
|
|
python_thread_state_save(&session->python_thread_state);
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
session->render();
|
|
|
|
|
2014-02-12 23:13:45 +01:00
|
|
|
python_thread_state_restore(&session->python_thread_state);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-12-24 02:47:13 +00:00
|
|
|
Py_RETURN_NONE;
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
2014-01-02 19:05:07 -02:00
|
|
|
/* pixel_array and result passed as pointers */
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *bake_func(PyObject * /*self*/, PyObject *args)
|
2014-01-02 19:05:07 -02:00
|
|
|
{
|
|
|
|
PyObject *pysession, *pyobject;
|
|
|
|
PyObject *pypixel_array, *pyresult;
|
|
|
|
const char *pass_type;
|
2016-01-15 13:00:56 -02:00
|
|
|
int num_pixels, depth, object_id, pass_filter;
|
2014-01-02 19:05:07 -02:00
|
|
|
|
2016-01-15 13:00:56 -02:00
|
|
|
if(!PyArg_ParseTuple(args, "OOsiiOiiO", &pysession, &pyobject, &pass_type, &pass_filter, &object_id, &pypixel_array, &num_pixels, &depth, &pyresult))
|
2014-01-02 19:05:07 -02:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
|
|
|
|
|
|
|
|
PointerRNA objectptr;
|
|
|
|
RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyobject), &objectptr);
|
|
|
|
BL::Object b_object(objectptr);
|
|
|
|
|
|
|
|
void *b_result = PyLong_AsVoidPtr(pyresult);
|
|
|
|
|
|
|
|
PointerRNA bakepixelptr;
|
2014-12-11 17:11:23 +05:00
|
|
|
RNA_pointer_create(NULL, &RNA_BakePixel, PyLong_AsVoidPtr(pypixel_array), &bakepixelptr);
|
2014-01-02 19:05:07 -02:00
|
|
|
BL::BakePixel b_bake_pixel(bakepixelptr);
|
|
|
|
|
2014-05-22 20:18:45 -03:00
|
|
|
python_thread_state_save(&session->python_thread_state);
|
|
|
|
|
2016-01-15 13:00:56 -02:00
|
|
|
session->bake(b_object, pass_type, pass_filter, object_id, b_bake_pixel, (size_t)num_pixels, depth, (float *)b_result);
|
2014-01-02 19:05:07 -02:00
|
|
|
|
2014-05-22 20:18:45 -03:00
|
|
|
python_thread_state_restore(&session->python_thread_state);
|
2014-01-02 19:05:07 -02:00
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *draw_func(PyObject * /*self*/, PyObject *args)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2011-05-05 13:51:33 +00:00
|
|
|
PyObject *pysession, *pyv3d, *pyrv3d;
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-05-05 13:51:33 +00:00
|
|
|
if(!PyArg_ParseTuple(args, "OOO", &pysession, &pyv3d, &pyrv3d))
|
2011-04-27 11:58:34 +00:00
|
|
|
return NULL;
|
|
|
|
|
2011-05-05 13:51:33 +00:00
|
|
|
BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2011-05-05 13:51:33 +00:00
|
|
|
if(PyLong_AsVoidPtr(pyrv3d)) {
|
2011-04-27 11:58:34 +00:00
|
|
|
/* 3d view drawing */
|
|
|
|
int viewport[4];
|
|
|
|
glGetIntegerv(GL_VIEWPORT, viewport);
|
|
|
|
|
2011-08-23 12:20:11 +00:00
|
|
|
session->draw(viewport[2], viewport[3]);
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
2011-12-24 02:47:13 +00:00
|
|
|
Py_RETURN_NONE;
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *reset_func(PyObject * /*self*/, PyObject *args)
|
2012-11-09 08:46:53 +00:00
|
|
|
{
|
|
|
|
PyObject *pysession, *pydata, *pyscene;
|
|
|
|
|
|
|
|
if(!PyArg_ParseTuple(args, "OOO", &pysession, &pydata, &pyscene))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
|
|
|
|
|
|
|
|
PointerRNA dataptr;
|
2014-12-11 17:11:23 +05:00
|
|
|
RNA_main_pointer_create((Main*)PyLong_AsVoidPtr(pydata), &dataptr);
|
2012-11-09 08:46:53 +00:00
|
|
|
BL::BlendData b_data(dataptr);
|
|
|
|
|
|
|
|
PointerRNA sceneptr;
|
|
|
|
RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyscene), &sceneptr);
|
|
|
|
BL::Scene b_scene(sceneptr);
|
|
|
|
|
2014-02-12 23:13:45 +01:00
|
|
|
python_thread_state_save(&session->python_thread_state);
|
2012-11-09 08:46:53 +00:00
|
|
|
|
|
|
|
session->reset_session(b_data, b_scene);
|
|
|
|
|
2014-02-12 23:13:45 +01:00
|
|
|
python_thread_state_restore(&session->python_thread_state);
|
2012-11-09 08:46:53 +00:00
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *sync_func(PyObject * /*self*/, PyObject *value)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2011-12-24 02:47:13 +00:00
|
|
|
BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(value);
|
2014-02-12 23:13:45 +01:00
|
|
|
|
|
|
|
python_thread_state_save(&session->python_thread_state);
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
session->synchronize();
|
|
|
|
|
2014-02-12 23:13:45 +01:00
|
|
|
python_thread_state_restore(&session->python_thread_state);
|
2012-09-04 13:29:07 +00:00
|
|
|
|
2011-12-24 02:47:13 +00:00
|
|
|
Py_RETURN_NONE;
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *available_devices_func(PyObject * /*self*/, PyObject * /*args*/)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2012-01-09 16:58:01 +00:00
|
|
|
vector<DeviceInfo>& devices = Device::available_devices();
|
|
|
|
PyObject *ret = PyTuple_New(devices.size());
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2012-01-09 16:58:01 +00:00
|
|
|
for(size_t i = 0; i < devices.size(); i++) {
|
|
|
|
DeviceInfo& device = devices[i];
|
Cycles: Refactor Device selection to allow individual GPU compute device selection
Previously, it was only possible to choose a single GPU or all of that type (CUDA or OpenCL).
Now, a toggle button is displayed for every device.
These settings are tied to the PCI Bus ID of the devices, so they're consistent across hardware addition and removal (but not when swapping/moving cards).
From the code perspective, the more important change is that now, the compute device properties are stored in the Addon preferences of the Cycles addon, instead of directly in the User Preferences.
This allows for a cleaner implementation, removing the Cycles C API functions that were called by the RNA code to specify the enum items.
Note that this change is neither backwards- nor forwards-compatible, but since it's only a User Preference no existing files are broken.
Reviewers: #cycles, brecht
Reviewed By: #cycles, brecht
Subscribers: brecht, juicyfruit, mib2berlin, Blendify
Differential Revision: https://developer.blender.org/D2338
2016-11-07 02:33:53 +01:00
|
|
|
string type_name = Device::string_from_type(device.type);
|
|
|
|
PyObject *device_tuple = PyTuple_New(3);
|
|
|
|
PyTuple_SET_ITEM(device_tuple, 0, PyUnicode_FromString(device.description.c_str()));
|
|
|
|
PyTuple_SET_ITEM(device_tuple, 1, PyUnicode_FromString(type_name.c_str()));
|
|
|
|
PyTuple_SET_ITEM(device_tuple, 2, PyUnicode_FromString(device.id.c_str()));
|
|
|
|
PyTuple_SET_ITEM(ret, i, device_tuple);
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-11-03 14:32:35 +00:00
|
|
|
#ifdef WITH_OSL
|
2013-03-18 16:34:57 +00:00
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
|
2012-11-03 14:32:35 +00:00
|
|
|
{
|
|
|
|
PyObject *pynodegroup, *pynode;
|
|
|
|
const char *filepath = NULL;
|
|
|
|
|
|
|
|
if(!PyArg_ParseTuple(args, "OOs", &pynodegroup, &pynode, &filepath))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* RNA */
|
|
|
|
PointerRNA nodeptr;
|
|
|
|
RNA_pointer_create((ID*)PyLong_AsVoidPtr(pynodegroup), &RNA_ShaderNodeScript, (void*)PyLong_AsVoidPtr(pynode), &nodeptr);
|
|
|
|
BL::ShaderNodeScript b_node(nodeptr);
|
|
|
|
|
|
|
|
/* update bytecode hash */
|
|
|
|
string bytecode = b_node.bytecode();
|
|
|
|
|
|
|
|
if(!bytecode.empty()) {
|
|
|
|
MD5Hash md5;
|
|
|
|
md5.append((const uint8_t*)bytecode.c_str(), bytecode.size());
|
|
|
|
b_node.bytecode_hash(md5.get_hex().c_str());
|
|
|
|
}
|
|
|
|
else
|
|
|
|
b_node.bytecode_hash("");
|
|
|
|
|
|
|
|
/* query from file path */
|
|
|
|
OSL::OSLQuery query;
|
|
|
|
|
|
|
|
if(!OSLShaderManager::osl_query(query, filepath))
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
|
|
|
|
/* add new sockets from parameters */
|
|
|
|
set<void*> used_sockets;
|
|
|
|
|
|
|
|
for(int i = 0; i < query.nparams(); i++) {
|
|
|
|
const OSL::OSLQuery::Parameter *param = query.getparam(i);
|
|
|
|
|
|
|
|
/* skip unsupported types */
|
|
|
|
if(param->varlenarray || param->isstruct || param->type.arraylen > 1)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* determine socket type */
|
2016-10-24 12:31:11 +02:00
|
|
|
string socket_type;
|
2013-03-18 16:34:57 +00:00
|
|
|
BL::NodeSocket::type_enum data_type = BL::NodeSocket::type_VALUE;
|
|
|
|
float4 default_float4 = make_float4(0.0f, 0.0f, 0.0f, 1.0f);
|
2012-11-03 14:32:35 +00:00
|
|
|
float default_float = 0.0f;
|
|
|
|
int default_int = 0;
|
2016-10-24 12:31:11 +02:00
|
|
|
string default_string = "";
|
|
|
|
|
2012-11-03 14:32:35 +00:00
|
|
|
if(param->isclosure) {
|
2013-03-18 16:34:57 +00:00
|
|
|
socket_type = "NodeSocketShader";
|
2013-05-01 13:28:44 +00:00
|
|
|
data_type = BL::NodeSocket::type_SHADER;
|
2012-11-03 14:32:35 +00:00
|
|
|
}
|
|
|
|
else if(param->type.vecsemantics == TypeDesc::COLOR) {
|
2013-03-18 16:34:57 +00:00
|
|
|
socket_type = "NodeSocketColor";
|
|
|
|
data_type = BL::NodeSocket::type_RGBA;
|
2012-11-03 14:32:35 +00:00
|
|
|
|
|
|
|
if(param->validdefault) {
|
|
|
|
default_float4[0] = param->fdefault[0];
|
|
|
|
default_float4[1] = param->fdefault[1];
|
|
|
|
default_float4[2] = param->fdefault[2];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(param->type.vecsemantics == TypeDesc::POINT ||
|
|
|
|
param->type.vecsemantics == TypeDesc::VECTOR ||
|
2014-05-05 02:19:08 +10:00
|
|
|
param->type.vecsemantics == TypeDesc::NORMAL)
|
|
|
|
{
|
2013-03-18 16:34:57 +00:00
|
|
|
socket_type = "NodeSocketVector";
|
|
|
|
data_type = BL::NodeSocket::type_VECTOR;
|
2012-11-03 14:32:35 +00:00
|
|
|
|
|
|
|
if(param->validdefault) {
|
|
|
|
default_float4[0] = param->fdefault[0];
|
|
|
|
default_float4[1] = param->fdefault[1];
|
|
|
|
default_float4[2] = param->fdefault[2];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(param->type.aggregate == TypeDesc::SCALAR) {
|
|
|
|
if(param->type.basetype == TypeDesc::INT) {
|
2013-03-18 16:34:57 +00:00
|
|
|
socket_type = "NodeSocketInt";
|
|
|
|
data_type = BL::NodeSocket::type_INT;
|
2012-11-03 14:32:35 +00:00
|
|
|
if(param->validdefault)
|
|
|
|
default_int = param->idefault[0];
|
|
|
|
}
|
|
|
|
else if(param->type.basetype == TypeDesc::FLOAT) {
|
2013-03-18 16:34:57 +00:00
|
|
|
socket_type = "NodeSocketFloat";
|
|
|
|
data_type = BL::NodeSocket::type_VALUE;
|
2012-11-03 14:32:35 +00:00
|
|
|
if(param->validdefault)
|
|
|
|
default_float = param->fdefault[0];
|
|
|
|
}
|
2012-11-06 21:36:44 +00:00
|
|
|
else if(param->type.basetype == TypeDesc::STRING) {
|
2013-03-18 16:34:57 +00:00
|
|
|
socket_type = "NodeSocketString";
|
|
|
|
data_type = BL::NodeSocket::type_STRING;
|
2012-11-06 21:36:44 +00:00
|
|
|
if(param->validdefault)
|
|
|
|
default_string = param->sdefault[0];
|
|
|
|
}
|
2012-11-09 21:27:05 +00:00
|
|
|
else
|
|
|
|
continue;
|
2012-11-03 14:32:35 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* find socket socket */
|
2013-03-18 16:34:57 +00:00
|
|
|
BL::NodeSocket b_sock(PointerRNA_NULL);
|
2015-03-28 00:15:15 +05:00
|
|
|
if(param->isoutput) {
|
2014-08-05 23:49:42 +02:00
|
|
|
b_sock = b_node.outputs[param->name.string()];
|
2013-03-18 16:34:57 +00:00
|
|
|
/* remove if type no longer matches */
|
|
|
|
if(b_sock && b_sock.bl_idname() != socket_type) {
|
|
|
|
b_node.outputs.remove(b_sock);
|
|
|
|
b_sock = BL::NodeSocket(PointerRNA_NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2014-08-05 23:49:42 +02:00
|
|
|
b_sock = b_node.inputs[param->name.string()];
|
2013-03-18 16:34:57 +00:00
|
|
|
/* remove if type no longer matches */
|
|
|
|
if(b_sock && b_sock.bl_idname() != socket_type) {
|
|
|
|
b_node.inputs.remove(b_sock);
|
|
|
|
b_sock = BL::NodeSocket(PointerRNA_NULL);
|
|
|
|
}
|
2012-11-03 14:32:35 +00:00
|
|
|
}
|
|
|
|
|
2013-06-10 20:47:58 +00:00
|
|
|
if(!b_sock) {
|
|
|
|
/* create new socket */
|
|
|
|
if(param->isoutput)
|
|
|
|
b_sock = b_node.outputs.create(socket_type.c_str(), param->name.c_str(), param->name.c_str());
|
|
|
|
else
|
|
|
|
b_sock = b_node.inputs.create(socket_type.c_str(), param->name.c_str(), param->name.c_str());
|
|
|
|
|
|
|
|
/* set default value */
|
2013-03-18 16:34:57 +00:00
|
|
|
if(data_type == BL::NodeSocket::type_VALUE) {
|
|
|
|
set_float(b_sock.ptr, "default_value", default_float);
|
2012-11-03 14:32:35 +00:00
|
|
|
}
|
2013-03-18 16:34:57 +00:00
|
|
|
else if(data_type == BL::NodeSocket::type_INT) {
|
|
|
|
set_int(b_sock.ptr, "default_value", default_int);
|
2012-11-03 14:32:35 +00:00
|
|
|
}
|
2013-03-18 16:34:57 +00:00
|
|
|
else if(data_type == BL::NodeSocket::type_RGBA) {
|
|
|
|
set_float4(b_sock.ptr, "default_value", default_float4);
|
2012-11-03 14:32:35 +00:00
|
|
|
}
|
2013-03-18 16:34:57 +00:00
|
|
|
else if(data_type == BL::NodeSocket::type_VECTOR) {
|
|
|
|
set_float3(b_sock.ptr, "default_value", float4_to_float3(default_float4));
|
2012-11-03 14:32:35 +00:00
|
|
|
}
|
2013-03-18 16:34:57 +00:00
|
|
|
else if(data_type == BL::NodeSocket::type_STRING) {
|
|
|
|
set_string(b_sock.ptr, "default_value", default_string);
|
2012-11-06 21:36:44 +00:00
|
|
|
}
|
2012-11-03 14:32:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
used_sockets.insert(b_sock.ptr.data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove unused parameters */
|
|
|
|
bool removed;
|
|
|
|
|
|
|
|
do {
|
|
|
|
BL::Node::inputs_iterator b_input;
|
|
|
|
BL::Node::outputs_iterator b_output;
|
|
|
|
|
|
|
|
removed = false;
|
|
|
|
|
2015-03-28 00:15:15 +05:00
|
|
|
for(b_node.inputs.begin(b_input); b_input != b_node.inputs.end(); ++b_input) {
|
2012-11-03 14:32:35 +00:00
|
|
|
if(used_sockets.find(b_input->ptr.data) == used_sockets.end()) {
|
2013-03-18 16:34:57 +00:00
|
|
|
b_node.inputs.remove(*b_input);
|
2012-11-03 14:32:35 +00:00
|
|
|
removed = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-28 00:15:15 +05:00
|
|
|
for(b_node.outputs.begin(b_output); b_output != b_node.outputs.end(); ++b_output) {
|
2012-11-03 14:32:35 +00:00
|
|
|
if(used_sockets.find(b_output->ptr.data) == used_sockets.end()) {
|
2013-03-18 16:34:57 +00:00
|
|
|
b_node.outputs.remove(*b_output);
|
2012-11-03 14:32:35 +00:00
|
|
|
removed = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while(removed);
|
|
|
|
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
}
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *osl_compile_func(PyObject * /*self*/, PyObject *args)
|
2012-11-03 14:32:35 +00:00
|
|
|
{
|
|
|
|
const char *inputfile = NULL, *outputfile = NULL;
|
|
|
|
|
|
|
|
if(!PyArg_ParseTuple(args, "ss", &inputfile, &outputfile))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* return */
|
|
|
|
if(!OSLShaderManager::osl_compile(inputfile, outputfile))
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-03-27 15:47:55 +05:00
|
|
|
static PyObject *system_info_func(PyObject * /*self*/, PyObject * /*value*/)
|
2015-01-06 14:13:21 +05:00
|
|
|
{
|
|
|
|
string system_info = Device::device_capabilities();
|
|
|
|
return PyUnicode_FromString(system_info.c_str());
|
|
|
|
}
|
|
|
|
|
2015-07-23 12:08:19 +02:00
|
|
|
#ifdef WITH_OPENCL
|
|
|
|
static PyObject *opencl_disable_func(PyObject * /*self*/, PyObject * /*value*/)
|
|
|
|
{
|
|
|
|
VLOG(2) << "Disabling OpenCL platform.";
|
2016-01-12 16:00:48 +05:00
|
|
|
DebugFlags().opencl.device_type = DebugFlags::OpenCL::DEVICE_NONE;
|
2015-07-23 12:08:19 +02:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-01-12 16:00:48 +05:00
|
|
|
static PyObject *debug_flags_update_func(PyObject * /*self*/, PyObject *args)
|
|
|
|
{
|
|
|
|
PyObject *pyscene;
|
|
|
|
if(!PyArg_ParseTuple(args, "O", &pyscene)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PointerRNA sceneptr;
|
|
|
|
RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyscene), &sceneptr);
|
|
|
|
BL::Scene b_scene(sceneptr);
|
|
|
|
|
|
|
|
if(debug_flags_sync_from_scene(b_scene)) {
|
|
|
|
VLOG(2) << "Tagging device list for update.";
|
|
|
|
Device::tag_update();
|
|
|
|
}
|
|
|
|
|
|
|
|
VLOG(2) << "Debug flags set to:\n"
|
|
|
|
<< DebugFlags();
|
|
|
|
|
|
|
|
debug_flags_set = true;
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *debug_flags_reset_func(PyObject * /*self*/, PyObject * /*args*/)
|
|
|
|
{
|
|
|
|
if(debug_flags_reset()) {
|
|
|
|
VLOG(2) << "Tagging device list for update.";
|
|
|
|
Device::tag_update();
|
|
|
|
}
|
|
|
|
if(debug_flags_set) {
|
|
|
|
VLOG(2) << "Debug flags reset to:\n"
|
|
|
|
<< DebugFlags();
|
|
|
|
debug_flags_set = false;
|
|
|
|
}
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2017-03-15 15:52:27 +01:00
|
|
|
static PyObject *set_resumable_chunk_func(PyObject * /*self*/, PyObject *args)
|
2016-03-30 15:55:12 +02:00
|
|
|
{
|
|
|
|
int num_resumable_chunks, current_resumable_chunk;
|
|
|
|
if(!PyArg_ParseTuple(args, "ii",
|
|
|
|
&num_resumable_chunks,
|
|
|
|
¤t_resumable_chunk)) {
|
2016-04-19 12:54:29 +02:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(num_resumable_chunks <= 0) {
|
|
|
|
fprintf(stderr, "Cycles: Bad value for number of resumable chunks.\n");
|
|
|
|
abort();
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
if(current_resumable_chunk < 1 ||
|
|
|
|
current_resumable_chunk > num_resumable_chunks)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "Cycles: Bad value for current resumable chunk number.\n");
|
|
|
|
abort();
|
|
|
|
Py_RETURN_NONE;
|
2016-03-30 15:55:12 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
VLOG(1) << "Initialized resumable render: "
|
|
|
|
<< "num_resumable_chunks=" << num_resumable_chunks << ", "
|
|
|
|
<< "current_resumable_chunk=" << current_resumable_chunk;
|
|
|
|
BlenderSession::num_resumable_chunks = num_resumable_chunks;
|
|
|
|
BlenderSession::current_resumable_chunk = current_resumable_chunk;
|
|
|
|
|
2016-04-19 12:54:29 +02:00
|
|
|
printf("Cycles: Will render chunk %d of %d\n",
|
|
|
|
current_resumable_chunk,
|
|
|
|
num_resumable_chunks);
|
|
|
|
|
2016-03-30 15:55:12 +02:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2017-03-15 15:52:27 +01:00
|
|
|
static PyObject *set_resumable_chunk_range_func(PyObject * /*self*/, PyObject *args)
|
|
|
|
{
|
|
|
|
int num_chunks, start_chunk, end_chunk;
|
|
|
|
if(!PyArg_ParseTuple(args, "iii",
|
|
|
|
&num_chunks,
|
|
|
|
&start_chunk,
|
|
|
|
&end_chunk)) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(num_chunks <= 0) {
|
|
|
|
fprintf(stderr, "Cycles: Bad value for number of resumable chunks.\n");
|
|
|
|
abort();
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
if(start_chunk < 1 || start_chunk > num_chunks) {
|
|
|
|
fprintf(stderr, "Cycles: Bad value for start chunk number.\n");
|
|
|
|
abort();
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
if(end_chunk < 1 || end_chunk > num_chunks) {
|
|
|
|
fprintf(stderr, "Cycles: Bad value for start chunk number.\n");
|
|
|
|
abort();
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
if(start_chunk > end_chunk) {
|
|
|
|
fprintf(stderr, "Cycles: End chunk should be higher than start one.\n");
|
|
|
|
abort();
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
VLOG(1) << "Initialized resumable render: "
|
|
|
|
<< "num_resumable_chunks=" << num_chunks << ", "
|
|
|
|
<< "start_resumable_chunk=" << start_chunk
|
|
|
|
<< "end_resumable_chunk=" << end_chunk;
|
|
|
|
BlenderSession::num_resumable_chunks = num_chunks;
|
|
|
|
BlenderSession::start_resumable_chunk = start_chunk;
|
|
|
|
BlenderSession::end_resumable_chunk = end_chunk;
|
|
|
|
|
|
|
|
printf("Cycles: Will render chunks %d to %d of %d\n",
|
|
|
|
start_chunk,
|
|
|
|
end_chunk,
|
|
|
|
num_chunks);
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
Cycles: Refactor Device selection to allow individual GPU compute device selection
Previously, it was only possible to choose a single GPU or all of that type (CUDA or OpenCL).
Now, a toggle button is displayed for every device.
These settings are tied to the PCI Bus ID of the devices, so they're consistent across hardware addition and removal (but not when swapping/moving cards).
From the code perspective, the more important change is that now, the compute device properties are stored in the Addon preferences of the Cycles addon, instead of directly in the User Preferences.
This allows for a cleaner implementation, removing the Cycles C API functions that were called by the RNA code to specify the enum items.
Note that this change is neither backwards- nor forwards-compatible, but since it's only a User Preference no existing files are broken.
Reviewers: #cycles, brecht
Reviewed By: #cycles, brecht
Subscribers: brecht, juicyfruit, mib2berlin, Blendify
Differential Revision: https://developer.blender.org/D2338
2016-11-07 02:33:53 +01:00
|
|
|
static PyObject *get_device_types_func(PyObject * /*self*/, PyObject * /*args*/)
|
|
|
|
{
|
|
|
|
vector<DeviceInfo>& devices = Device::available_devices();
|
|
|
|
bool has_cuda = false, has_opencl = false;
|
|
|
|
for(int i = 0; i < devices.size(); i++) {
|
|
|
|
has_cuda |= (devices[i].type == DEVICE_CUDA);
|
|
|
|
has_opencl |= (devices[i].type == DEVICE_OPENCL);
|
|
|
|
}
|
|
|
|
PyObject *list = PyTuple_New(2);
|
|
|
|
PyTuple_SET_ITEM(list, 0, PyBool_FromLong(has_cuda));
|
|
|
|
PyTuple_SET_ITEM(list, 1, PyBool_FromLong(has_opencl));
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
static PyMethodDef methods[] = {
|
|
|
|
{"init", init_func, METH_VARARGS, ""},
|
2016-02-07 03:40:41 +05:00
|
|
|
{"exit", exit_func, METH_VARARGS, ""},
|
2011-04-27 11:58:34 +00:00
|
|
|
{"create", create_func, METH_VARARGS, ""},
|
2011-12-24 02:47:13 +00:00
|
|
|
{"free", free_func, METH_O, ""},
|
|
|
|
{"render", render_func, METH_O, ""},
|
2014-01-02 19:05:07 -02:00
|
|
|
{"bake", bake_func, METH_VARARGS, ""},
|
2011-04-27 11:58:34 +00:00
|
|
|
{"draw", draw_func, METH_VARARGS, ""},
|
2011-12-24 02:47:13 +00:00
|
|
|
{"sync", sync_func, METH_O, ""},
|
2012-11-09 08:46:53 +00:00
|
|
|
{"reset", reset_func, METH_VARARGS, ""},
|
2012-11-03 14:32:35 +00:00
|
|
|
#ifdef WITH_OSL
|
|
|
|
{"osl_update_node", osl_update_node_func, METH_VARARGS, ""},
|
|
|
|
{"osl_compile", osl_compile_func, METH_VARARGS, ""},
|
|
|
|
#endif
|
2011-04-27 11:58:34 +00:00
|
|
|
{"available_devices", available_devices_func, METH_NOARGS, ""},
|
2015-01-06 14:13:21 +05:00
|
|
|
{"system_info", system_info_func, METH_NOARGS, ""},
|
2015-07-23 12:08:19 +02:00
|
|
|
#ifdef WITH_OPENCL
|
|
|
|
{"opencl_disable", opencl_disable_func, METH_NOARGS, ""},
|
|
|
|
#endif
|
2016-03-30 15:55:12 +02:00
|
|
|
|
|
|
|
/* Debugging routines */
|
2016-01-12 16:00:48 +05:00
|
|
|
{"debug_flags_update", debug_flags_update_func, METH_VARARGS, ""},
|
|
|
|
{"debug_flags_reset", debug_flags_reset_func, METH_NOARGS, ""},
|
2016-03-30 15:55:12 +02:00
|
|
|
|
|
|
|
/* Resumable render */
|
2017-03-15 15:52:27 +01:00
|
|
|
{"set_resumable_chunk", set_resumable_chunk_func, METH_VARARGS, ""},
|
|
|
|
{"set_resumable_chunk_range", set_resumable_chunk_range_func, METH_VARARGS, ""},
|
2016-03-30 15:55:12 +02:00
|
|
|
|
Cycles: Refactor Device selection to allow individual GPU compute device selection
Previously, it was only possible to choose a single GPU or all of that type (CUDA or OpenCL).
Now, a toggle button is displayed for every device.
These settings are tied to the PCI Bus ID of the devices, so they're consistent across hardware addition and removal (but not when swapping/moving cards).
From the code perspective, the more important change is that now, the compute device properties are stored in the Addon preferences of the Cycles addon, instead of directly in the User Preferences.
This allows for a cleaner implementation, removing the Cycles C API functions that were called by the RNA code to specify the enum items.
Note that this change is neither backwards- nor forwards-compatible, but since it's only a User Preference no existing files are broken.
Reviewers: #cycles, brecht
Reviewed By: #cycles, brecht
Subscribers: brecht, juicyfruit, mib2berlin, Blendify
Differential Revision: https://developer.blender.org/D2338
2016-11-07 02:33:53 +01:00
|
|
|
/* Compute Device selection */
|
|
|
|
{"get_device_types", get_device_types_func, METH_VARARGS, ""},
|
|
|
|
|
2011-05-31 16:19:02 +00:00
|
|
|
{NULL, NULL, 0, NULL},
|
2011-04-27 11:58:34 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct PyModuleDef module = {
|
|
|
|
PyModuleDef_HEAD_INIT,
|
2011-12-24 02:47:13 +00:00
|
|
|
"_cycles",
|
2011-11-07 17:13:32 +00:00
|
|
|
"Blender cycles render integration",
|
2011-04-27 11:58:34 +00:00
|
|
|
-1,
|
2011-05-31 16:19:02 +00:00
|
|
|
methods,
|
|
|
|
NULL, NULL, NULL, NULL
|
2011-04-27 11:58:34 +00:00
|
|
|
};
|
|
|
|
|
2012-01-09 16:58:01 +00:00
|
|
|
CCL_NAMESPACE_END
|
|
|
|
|
|
|
|
void *CCL_python_module_init()
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
2012-06-09 18:56:12 +00:00
|
|
|
PyObject *mod = PyModule_Create(&ccl::module);
|
2011-12-24 02:47:13 +00:00
|
|
|
|
|
|
|
#ifdef WITH_OSL
|
2013-12-08 15:03:17 +06:00
|
|
|
/* TODO(sergey): This gives us library we've been linking against.
|
|
|
|
* In theory with dynamic OSL library it might not be
|
|
|
|
* accurate, but there's nothing in OSL API which we
|
2014-03-01 01:21:25 +01:00
|
|
|
* might use to get version in runtime.
|
2013-12-08 15:03:17 +06:00
|
|
|
*/
|
|
|
|
int curversion = OSL_LIBRARY_VERSION_CODE;
|
2011-12-24 02:47:13 +00:00
|
|
|
PyModule_AddObject(mod, "with_osl", Py_True);
|
|
|
|
Py_INCREF(Py_True);
|
2013-12-08 15:03:17 +06:00
|
|
|
PyModule_AddObject(mod, "osl_version",
|
|
|
|
Py_BuildValue("(iii)",
|
|
|
|
curversion / 10000, (curversion / 100) % 100, curversion % 100));
|
|
|
|
PyModule_AddObject(mod, "osl_version_string",
|
|
|
|
PyUnicode_FromFormat("%2d, %2d, %2d",
|
|
|
|
curversion / 10000, (curversion / 100) % 100, curversion % 100));
|
2011-12-24 02:47:13 +00:00
|
|
|
#else
|
|
|
|
PyModule_AddObject(mod, "with_osl", Py_False);
|
|
|
|
Py_INCREF(Py_False);
|
2013-12-08 15:19:21 +06:00
|
|
|
PyModule_AddStringConstant(mod, "osl_version", "unknown");
|
|
|
|
PyModule_AddStringConstant(mod, "osl_version_string", "unknown");
|
2011-12-24 02:47:13 +00:00
|
|
|
#endif
|
|
|
|
|
Render API/Cycles: Identify Render Passes by their name instead of a type flag
Previously, every RenderPass would have a bitfield that specified its type. That limits the number of passes to 32, which was reached a while ago.
However, most of the code already supported arbitrary RenderPasses since they were also used to store Multilayer EXR images.
Therefore, this commit completely removes the passflag from RenderPass and changes all code to use the unique pass name for identification.
Since Blender Internal relies on hardcoded passes and to preserve compatibility, 32 pass names are reserved for the old hardcoded passes.
To support these arbitrary passes, the Render Result compositor node now adds dynamic sockets. For compatibility, the old hardcoded sockets are always stored and just hidden when the corresponding pass isn't available.
To use these changes, the Render Engine API now includes a function that allows render engines to add arbitrary passes to the render result. To be able to add options for these passes, addons can now add their own properties to SceneRenderLayers.
To keep the compositor input node updated, render engine plugins have to implement a callback that registers all the passes that will be generated.
From a user perspective, nothing should change with this commit.
Differential Revision: https://developer.blender.org/D2443
Differential Revision: https://developer.blender.org/D2444
2017-05-03 00:21:18 +02:00
|
|
|
#ifdef WITH_CYCLES_DEBUG
|
|
|
|
PyModule_AddObject(mod, "with_cycles_debug", Py_True);
|
|
|
|
Py_INCREF(Py_True);
|
|
|
|
#else
|
|
|
|
PyModule_AddObject(mod, "with_cycles_debug", Py_False);
|
|
|
|
Py_INCREF(Py_False);
|
|
|
|
#endif
|
|
|
|
|
2013-12-07 02:29:53 +01:00
|
|
|
#ifdef WITH_NETWORK
|
|
|
|
PyModule_AddObject(mod, "with_network", Py_True);
|
|
|
|
Py_INCREF(Py_True);
|
|
|
|
#else /* WITH_NETWORK */
|
|
|
|
PyModule_AddObject(mod, "with_network", Py_False);
|
|
|
|
Py_INCREF(Py_False);
|
|
|
|
#endif /* WITH_NETWORK */
|
|
|
|
|
2012-01-09 16:58:01 +00:00
|
|
|
return (void*)mod;
|
|
|
|
}
|