Clang-Format: Allow empty functions to be single-line
For example ``` OIIOOutputDriver::~OIIOOutputDriver() { } ``` becomes ``` OIIOOutputDriver::~OIIOOutputDriver() {} ``` Saves quite some vertical space, which is especially handy for constructors. Pull Request: https://projects.blender.org/blender/blender/pulls/105594
This commit is contained in:
parent
cc7634f2ea
commit
d32d787f5f
@ -130,7 +130,7 @@ PenaltyReturnTypeOnItsOwnLine: 10000
|
|||||||
#
|
#
|
||||||
PenaltyBreakAssignment: 100
|
PenaltyBreakAssignment: 100
|
||||||
|
|
||||||
AllowShortFunctionsOnASingleLine: None
|
AllowShortFunctionsOnASingleLine: Empty
|
||||||
|
|
||||||
SortIncludes: true
|
SortIncludes: true
|
||||||
|
|
||||||
|
@ -17,9 +17,7 @@ OIIOOutputDriver::OIIOOutputDriver(const string_view filepath,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
OIIOOutputDriver::~OIIOOutputDriver()
|
OIIOOutputDriver::~OIIOOutputDriver() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OIIOOutputDriver::write_render_tile(const Tile &tile)
|
void OIIOOutputDriver::write_render_tile(const Tile &tile)
|
||||||
{
|
{
|
||||||
|
@ -22,9 +22,7 @@ OpenGLDisplayDriver::OpenGLDisplayDriver(const function<bool()> &gl_context_enab
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
OpenGLDisplayDriver::~OpenGLDisplayDriver()
|
OpenGLDisplayDriver::~OpenGLDisplayDriver() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* --------------------------------------------------------------------
|
/* --------------------------------------------------------------------
|
||||||
* Update procedure.
|
* Update procedure.
|
||||||
|
@ -149,9 +149,7 @@ void OpenGLShader::bind(int width, int height)
|
|||||||
glUniform2f(fullscreen_location_, width, height);
|
glUniform2f(fullscreen_location_, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OpenGLShader::unbind()
|
void OpenGLShader::unbind() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
uint OpenGLShader::get_shader_program()
|
uint OpenGLShader::get_shader_program()
|
||||||
{
|
{
|
||||||
|
@ -20,13 +20,9 @@
|
|||||||
|
|
||||||
CCL_NAMESPACE_BEGIN
|
CCL_NAMESPACE_BEGIN
|
||||||
|
|
||||||
ParticleCurveData::ParticleCurveData()
|
ParticleCurveData::ParticleCurveData() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ParticleCurveData::~ParticleCurveData()
|
ParticleCurveData::~ParticleCurveData() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static float shaperadius(float shape, float root, float tip, float time)
|
static float shaperadius(float shape, float root, float tip, float time)
|
||||||
{
|
{
|
||||||
|
@ -22,9 +22,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
template<typename K, typename T, typename Flags = uint> class id_map {
|
template<typename K, typename T, typename Flags = uint> class id_map {
|
||||||
public:
|
public:
|
||||||
id_map(Scene *scene_) : scene(scene_)
|
id_map(Scene *scene_) : scene(scene_) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
~id_map()
|
~id_map()
|
||||||
{
|
{
|
||||||
@ -262,9 +260,7 @@ struct GeometryKey {
|
|||||||
void *id;
|
void *id;
|
||||||
Geometry::Type geometry_type;
|
Geometry::Type geometry_type;
|
||||||
|
|
||||||
GeometryKey(void *id, Geometry::Type geometry_type) : id(id), geometry_type(geometry_type)
|
GeometryKey(void *id, Geometry::Type geometry_type) : id(id), geometry_type(geometry_type) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator<(const GeometryKey &k) const
|
bool operator<(const GeometryKey &k) const
|
||||||
{
|
{
|
||||||
|
@ -649,9 +649,7 @@ static void attr_create_subd_uv_map(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh,
|
|||||||
/* Compare vertices by sum of their coordinates. */
|
/* Compare vertices by sum of their coordinates. */
|
||||||
class VertexAverageComparator {
|
class VertexAverageComparator {
|
||||||
public:
|
public:
|
||||||
VertexAverageComparator(const array<float3> &verts) : verts_(verts)
|
VertexAverageComparator(const array<float3> &verts) : verts_(verts) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator()(const int &vert_idx_a, const int &vert_idx_b)
|
bool operator()(const int &vert_idx_a, const int &vert_idx_b)
|
||||||
{
|
{
|
||||||
|
@ -5,13 +5,9 @@
|
|||||||
|
|
||||||
CCL_NAMESPACE_BEGIN
|
CCL_NAMESPACE_BEGIN
|
||||||
|
|
||||||
BlenderOutputDriver::BlenderOutputDriver(BL::RenderEngine &b_engine) : b_engine_(b_engine)
|
BlenderOutputDriver::BlenderOutputDriver(BL::RenderEngine &b_engine) : b_engine_(b_engine) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
BlenderOutputDriver::~BlenderOutputDriver()
|
BlenderOutputDriver::~BlenderOutputDriver() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool BlenderOutputDriver::read_render_tile(const Tile &tile)
|
bool BlenderOutputDriver::read_render_tile(const Tile &tile)
|
||||||
{
|
{
|
||||||
|
@ -67,9 +67,7 @@ BlenderSync::BlenderSync(BL::RenderEngine &b_engine,
|
|||||||
max_subdivisions = RNA_int_get(&cscene, "max_subdivisions");
|
max_subdivisions = RNA_int_get(&cscene, "max_subdivisions");
|
||||||
}
|
}
|
||||||
|
|
||||||
BlenderSync::~BlenderSync()
|
BlenderSync::~BlenderSync() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BlenderSync::reset(BL::BlendData &b_data, BL::Scene &b_scene)
|
void BlenderSync::reset(BL::BlendData &b_data, BL::Scene &b_scene)
|
||||||
{
|
{
|
||||||
|
@ -702,9 +702,7 @@ static inline bool object_need_motion_attribute(BObjectInfo &b_ob_info, Scene *s
|
|||||||
|
|
||||||
class EdgeMap {
|
class EdgeMap {
|
||||||
public:
|
public:
|
||||||
EdgeMap()
|
EdgeMap() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void clear()
|
void clear()
|
||||||
{
|
{
|
||||||
|
@ -16,18 +16,10 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
/* SSE replacements */
|
/* SSE replacements */
|
||||||
|
|
||||||
__forceinline void prefetch_L1(const void * /*ptr*/)
|
__forceinline void prefetch_L1(const void * /*ptr*/) {}
|
||||||
{
|
__forceinline void prefetch_L2(const void * /*ptr*/) {}
|
||||||
}
|
__forceinline void prefetch_L3(const void * /*ptr*/) {}
|
||||||
__forceinline void prefetch_L2(const void * /*ptr*/)
|
__forceinline void prefetch_NTA(const void * /*ptr*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
__forceinline void prefetch_L3(const void * /*ptr*/)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
__forceinline void prefetch_NTA(const void * /*ptr*/)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
template<size_t src> __forceinline float extract(const int4 &b)
|
template<size_t src> __forceinline float extract(const int4 &b)
|
||||||
{
|
{
|
||||||
|
@ -23,9 +23,7 @@ class BVHBuild;
|
|||||||
|
|
||||||
class BVHObjectBinning : public BVHRange {
|
class BVHObjectBinning : public BVHRange {
|
||||||
public:
|
public:
|
||||||
__forceinline BVHObjectBinning() : leafSAH(FLT_MAX)
|
__forceinline BVHObjectBinning() : leafSAH(FLT_MAX) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
BVHObjectBinning(const BVHRange &job,
|
BVHObjectBinning(const BVHRange &job,
|
||||||
BVHReference *prims,
|
BVHReference *prims,
|
||||||
|
@ -49,9 +49,7 @@ BVHBuild::BVHBuild(const vector<Object *> &objects_,
|
|||||||
spatial_min_overlap = 0.0f;
|
spatial_min_overlap = 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
BVHBuild::~BVHBuild()
|
BVHBuild::~BVHBuild() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Adding References */
|
/* Adding References */
|
||||||
|
|
||||||
|
@ -70,9 +70,7 @@ class BVH {
|
|||||||
const vector<Geometry *> &geometry,
|
const vector<Geometry *> &geometry,
|
||||||
const vector<Object *> &objects,
|
const vector<Object *> &objects,
|
||||||
Device *device);
|
Device *device);
|
||||||
virtual ~BVH()
|
virtual ~BVH() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void replace_geometry(const vector<Geometry *> &geometry,
|
virtual void replace_geometry(const vector<Geometry *> &geometry,
|
||||||
const vector<Object *> &objects)
|
const vector<Object *> &objects)
|
||||||
|
@ -18,9 +18,7 @@
|
|||||||
|
|
||||||
CCL_NAMESPACE_BEGIN
|
CCL_NAMESPACE_BEGIN
|
||||||
|
|
||||||
BVHStackEntry::BVHStackEntry(const BVHNode *n, int i) : node(n), idx(i)
|
BVHStackEntry::BVHStackEntry(const BVHNode *n, int i) : node(n), idx(i) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int BVHStackEntry::encodeIdx() const
|
int BVHStackEntry::encodeIdx() const
|
||||||
{
|
{
|
||||||
|
@ -211,9 +211,7 @@ class LeafNode : public BVHNode {
|
|||||||
this->visibility = visibility;
|
this->visibility = visibility;
|
||||||
}
|
}
|
||||||
|
|
||||||
LeafNode(const LeafNode &other) : BVHNode(other), lo(other.lo), hi(other.hi)
|
LeafNode(const LeafNode &other) : BVHNode(other), lo(other.lo), hi(other.hi) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool is_leaf() const
|
bool is_leaf() const
|
||||||
{
|
{
|
||||||
|
@ -183,9 +183,7 @@ class BVHParams {
|
|||||||
|
|
||||||
class BVHReference {
|
class BVHReference {
|
||||||
public:
|
public:
|
||||||
__forceinline BVHReference()
|
__forceinline BVHReference() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
__forceinline BVHReference(const BoundBox &bounds_,
|
__forceinline BVHReference(const BoundBox &bounds_,
|
||||||
int prim_index_,
|
int prim_index_,
|
||||||
@ -307,9 +305,7 @@ struct BVHSpatialBin {
|
|||||||
int enter;
|
int enter;
|
||||||
int exit;
|
int exit;
|
||||||
|
|
||||||
__forceinline BVHSpatialBin()
|
__forceinline BVHSpatialBin() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* BVH Spatial Storage
|
/* BVH Spatial Storage
|
||||||
|
@ -26,9 +26,7 @@ class BVHObjectSplit {
|
|||||||
BoundBox left_bounds;
|
BoundBox left_bounds;
|
||||||
BoundBox right_bounds;
|
BoundBox right_bounds;
|
||||||
|
|
||||||
BVHObjectSplit()
|
BVHObjectSplit() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
BVHObjectSplit(BVHBuild *builder,
|
BVHObjectSplit(BVHBuild *builder,
|
||||||
BVHSpatialStorage *storage,
|
BVHSpatialStorage *storage,
|
||||||
const BVHRange &range,
|
const BVHRange &range,
|
||||||
@ -64,9 +62,7 @@ class BVHSpatialSplit {
|
|||||||
int dim;
|
int dim;
|
||||||
float pos;
|
float pos;
|
||||||
|
|
||||||
BVHSpatialSplit() : sah(FLT_MAX), dim(0), pos(0.0f), storage_(NULL), references_(NULL)
|
BVHSpatialSplit() : sah(FLT_MAX), dim(0), pos(0.0f), storage_(NULL), references_(NULL) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
BVHSpatialSplit(const BVHBuild &builder,
|
BVHSpatialSplit(const BVHBuild &builder,
|
||||||
BVHSpatialStorage *storage,
|
BVHSpatialStorage *storage,
|
||||||
const BVHRange &range,
|
const BVHRange &range,
|
||||||
@ -181,9 +177,7 @@ class BVHMixedSplit {
|
|||||||
|
|
||||||
BoundBox bounds;
|
BoundBox bounds;
|
||||||
|
|
||||||
BVHMixedSplit()
|
BVHMixedSplit() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
__forceinline BVHMixedSplit(BVHBuild *builder,
|
__forceinline BVHMixedSplit(BVHBuild *builder,
|
||||||
BVHSpatialStorage *storage,
|
BVHSpatialStorage *storage,
|
||||||
|
@ -14,9 +14,7 @@
|
|||||||
|
|
||||||
CCL_NAMESPACE_BEGIN
|
CCL_NAMESPACE_BEGIN
|
||||||
|
|
||||||
BVHUnaligned::BVHUnaligned(const vector<Object *> &objects) : objects_(objects)
|
BVHUnaligned::BVHUnaligned(const vector<Object *> &objects) : objects_(objects) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Transform BVHUnaligned::compute_aligned_space(const BVHObjectBinning &range,
|
Transform BVHUnaligned::compute_aligned_space(const BVHObjectBinning &range,
|
||||||
const BVHReference *references) const
|
const BVHReference *references) const
|
||||||
|
@ -40,9 +40,7 @@ template<typename FunctionType> class CPUKernelFunction {
|
|||||||
* pointer. */
|
* pointer. */
|
||||||
class KernelInfo {
|
class KernelInfo {
|
||||||
public:
|
public:
|
||||||
KernelInfo() : KernelInfo("", nullptr)
|
KernelInfo() : KernelInfo("", nullptr) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TODO(sergey): Use string view, to have higher-level functionality (i.e. comparison) without
|
/* TODO(sergey): Use string view, to have higher-level functionality (i.e. comparison) without
|
||||||
* memory allocation. */
|
* memory allocation. */
|
||||||
|
@ -70,8 +70,6 @@ NODE_DEFINE(DenoiseParams)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
DenoiseParams::DenoiseParams() : Node(get_node_type())
|
DenoiseParams::DenoiseParams() : Node(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
CCL_NAMESPACE_END
|
CCL_NAMESPACE_END
|
||||||
|
@ -45,9 +45,7 @@ uint Device::devices_initialized_mask = 0;
|
|||||||
|
|
||||||
/* Device */
|
/* Device */
|
||||||
|
|
||||||
Device::~Device() noexcept(false)
|
Device::~Device() noexcept(false) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Device::build_bvh(BVH *bvh, Progress &progress, bool refit)
|
void Device::build_bvh(BVH *bvh, Progress &progress, bool refit)
|
||||||
{
|
{
|
||||||
@ -452,9 +450,7 @@ void *Device::get_cpu_osl_memory()
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
GPUDevice::~GPUDevice() noexcept(false)
|
GPUDevice::~GPUDevice() noexcept(false) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool GPUDevice::load_texture_info()
|
bool GPUDevice::load_texture_info()
|
||||||
{
|
{
|
||||||
|
@ -178,9 +178,7 @@ class Device {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Request cancellation of any long-running work. */
|
/* Request cancellation of any long-running work. */
|
||||||
virtual void cancel()
|
virtual void cancel() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Report status and return true if device is ready for rendering. */
|
/* Report status and return true if device is ready for rendering. */
|
||||||
virtual bool is_ready(string & /*status*/) const
|
virtual bool is_ready(string & /*status*/) const
|
||||||
@ -218,9 +216,7 @@ class Device {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Called after kernel texture setup, and prior to integrator state setup. */
|
/* Called after kernel texture setup, and prior to integrator state setup. */
|
||||||
virtual void optimize_for_scene(Scene * /*scene*/)
|
virtual void optimize_for_scene(Scene * /*scene*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual bool is_resident(device_ptr /*key*/, Device *sub_device)
|
virtual bool is_resident(device_ptr /*key*/, Device *sub_device)
|
||||||
{
|
{
|
||||||
@ -350,9 +346,7 @@ class GPUDevice : public Device {
|
|||||||
typedef unsigned long long texMemObject;
|
typedef unsigned long long texMemObject;
|
||||||
typedef unsigned long long arrayMemObject;
|
typedef unsigned long long arrayMemObject;
|
||||||
struct Mem {
|
struct Mem {
|
||||||
Mem() : texobject(0), array(0), use_mapped_host(false)
|
Mem() : texobject(0), array(0), use_mapped_host(false) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
texMemObject texobject;
|
texMemObject texobject;
|
||||||
arrayMemObject array;
|
arrayMemObject array;
|
||||||
|
@ -18,38 +18,24 @@ class DummyDevice : public Device {
|
|||||||
error_msg = info.error_msg;
|
error_msg = info.error_msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
~DummyDevice()
|
~DummyDevice() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual BVHLayoutMask get_bvh_layout_mask() const override
|
virtual BVHLayoutMask get_bvh_layout_mask() const override
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void mem_alloc(device_memory &) override
|
virtual void mem_alloc(device_memory &) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void mem_copy_to(device_memory &) override
|
virtual void mem_copy_to(device_memory &) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void mem_copy_from(device_memory &, size_t, size_t, size_t, size_t) override
|
virtual void mem_copy_from(device_memory &, size_t, size_t, size_t, size_t) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void mem_zero(device_memory &) override
|
virtual void mem_zero(device_memory &) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void mem_free(device_memory &) override
|
virtual void mem_free(device_memory &) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void const_copy_to(const char *, void *, size_t) override
|
virtual void const_copy_to(const char *, void *, size_t) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Device *device_dummy_create(const DeviceInfo &info, Stats &stats, Profiler &profiler)
|
Device *device_dummy_create(const DeviceInfo &info, Stats &stats, Profiler &profiler)
|
||||||
|
@ -305,9 +305,7 @@ template<typename T> class device_only_memory : public device_memory {
|
|||||||
data_elements = max(device_type_traits<T>::num_elements, size_t(1));
|
data_elements = max(device_type_traits<T>::num_elements, size_t(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
device_only_memory(device_only_memory &&other) noexcept : device_memory(std::move(other))
|
device_only_memory(device_only_memory &&other) noexcept : device_memory(std::move(other)) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ~device_only_memory()
|
virtual ~device_only_memory()
|
||||||
{
|
{
|
||||||
|
@ -93,9 +93,7 @@ bool device_metal_init()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void device_metal_info(vector<DeviceInfo> &devices)
|
void device_metal_info(vector<DeviceInfo> &devices) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
string device_metal_capabilities()
|
string device_metal_capabilities()
|
||||||
{
|
{
|
||||||
|
@ -15,9 +15,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
/* CUDADeviceQueue */
|
/* CUDADeviceQueue */
|
||||||
|
|
||||||
OptiXDeviceQueue::OptiXDeviceQueue(OptiXDevice *device) : CUDADeviceQueue(device)
|
OptiXDeviceQueue::OptiXDeviceQueue(OptiXDevice *device) : CUDADeviceQueue(device) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OptiXDeviceQueue::init_execution()
|
void OptiXDeviceQueue::init_execution()
|
||||||
{
|
{
|
||||||
|
@ -36,9 +36,7 @@ struct DeviceKernelArguments {
|
|||||||
size_t sizes[MAX_ARGS];
|
size_t sizes[MAX_ARGS];
|
||||||
size_t count = 0;
|
size_t count = 0;
|
||||||
|
|
||||||
DeviceKernelArguments()
|
DeviceKernelArguments() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
template<class T> DeviceKernelArguments(const T *arg)
|
template<class T> DeviceKernelArguments(const T *arg)
|
||||||
{
|
{
|
||||||
|
@ -13,9 +13,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
/* Node Type */
|
/* Node Type */
|
||||||
|
|
||||||
NodeOwner::~NodeOwner()
|
NodeOwner::~NodeOwner() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Node::Node(const NodeType *type_, ustring name_) : name(name_), type(type_)
|
Node::Node(const NodeType *type_, ustring name_) : name(name_), type(type_)
|
||||||
{
|
{
|
||||||
@ -35,9 +33,7 @@ Node::Node(const NodeType *type_, ustring name_) : name(name_), type(type_)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Node::~Node()
|
Node::~Node() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
static bool is_socket_float3(const SocketType &socket)
|
static bool is_socket_float3(const SocketType &socket)
|
||||||
|
@ -131,9 +131,7 @@ NodeType::NodeType(Type type, const NodeType *base) : type(type), base(base)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeType::~NodeType()
|
NodeType::~NodeType() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void NodeType::register_input(ustring name,
|
void NodeType::register_input(ustring name,
|
||||||
ustring ui_name,
|
ustring ui_name,
|
||||||
|
@ -51,9 +51,7 @@ HdCyclesCamera::HdCyclesCamera(const SdfPath &sprimId) : HdCamera(sprimId)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesCamera::~HdCyclesCamera()
|
HdCyclesCamera::~HdCyclesCamera() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdDirtyBits HdCyclesCamera::GetInitialDirtyBitsMask() const
|
HdDirtyBits HdCyclesCamera::GetInitialDirtyBitsMask() const
|
||||||
{
|
{
|
||||||
|
@ -25,9 +25,7 @@ HdCyclesCurves::HdCyclesCurves(const SdfPath &rprimId
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesCurves::~HdCyclesCurves()
|
HdCyclesCurves::~HdCyclesCurves() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdDirtyBits HdCyclesCurves::GetInitialDirtyBitsMask() const
|
HdDirtyBits HdCyclesCurves::GetInitialDirtyBitsMask() const
|
||||||
{
|
{
|
||||||
|
@ -112,9 +112,7 @@ void HdCyclesDisplayDriver::gl_context_dispose()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void HdCyclesDisplayDriver::next_tile_begin()
|
void HdCyclesDisplayDriver::next_tile_begin() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HdCyclesDisplayDriver::update_begin(const Params ¶ms,
|
bool HdCyclesDisplayDriver::update_begin(const Params ¶ms,
|
||||||
int texture_width,
|
int texture_width,
|
||||||
|
@ -37,13 +37,9 @@ class HdCyclesVolumeLoader : public VDBImageLoader {
|
|||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
HdCyclesField::HdCyclesField(const SdfPath &bprimId, const TfToken &typeId) : HdField(bprimId)
|
HdCyclesField::HdCyclesField(const SdfPath &bprimId, const TfToken &typeId) : HdField(bprimId) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdCyclesField::~HdCyclesField()
|
HdCyclesField::~HdCyclesField() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdDirtyBits HdCyclesField::GetInitialDirtyBitsMask() const
|
HdDirtyBits HdCyclesField::GetInitialDirtyBitsMask() const
|
||||||
{
|
{
|
||||||
|
@ -32,17 +32,11 @@ class DummyHdTask : public HdTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void Sync(HdSceneDelegate *delegate, HdTaskContext *ctx, HdDirtyBits *dirtyBits) override
|
void Sync(HdSceneDelegate *delegate, HdTaskContext *ctx, HdDirtyBits *dirtyBits) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Prepare(HdTaskContext *ctx, HdRenderIndex *render_index) override
|
void Prepare(HdTaskContext *ctx, HdRenderIndex *render_index) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Execute(HdTaskContext *ctx) override
|
void Execute(HdTaskContext *ctx) override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
const TfTokenVector &GetRenderTags() const override
|
const TfTokenVector &GetRenderTags() const override
|
||||||
{
|
{
|
||||||
|
@ -26,9 +26,7 @@ HdCyclesInstancer::HdCyclesInstancer(HdSceneDelegate *delegate,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesInstancer::~HdCyclesInstancer()
|
HdCyclesInstancer::~HdCyclesInstancer() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#if PXR_VERSION > 2011
|
#if PXR_VERSION > 2011
|
||||||
void HdCyclesInstancer::Sync(HdSceneDelegate *sceneDelegate,
|
void HdCyclesInstancer::Sync(HdSceneDelegate *sceneDelegate,
|
||||||
|
@ -29,9 +29,7 @@ HdCyclesLight::HdCyclesLight(const SdfPath &sprimId, const TfToken &lightType)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesLight::~HdCyclesLight()
|
HdCyclesLight::~HdCyclesLight() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdDirtyBits HdCyclesLight::GetInitialDirtyBitsMask() const
|
HdDirtyBits HdCyclesLight::GetInitialDirtyBitsMask() const
|
||||||
{
|
{
|
||||||
|
@ -183,13 +183,9 @@ TfStaticData<UsdToCycles> sUsdToCyles;
|
|||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
HdCyclesMaterial::HdCyclesMaterial(const SdfPath &sprimId) : HdMaterial(sprimId)
|
HdCyclesMaterial::HdCyclesMaterial(const SdfPath &sprimId) : HdMaterial(sprimId) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdCyclesMaterial::~HdCyclesMaterial()
|
HdCyclesMaterial::~HdCyclesMaterial() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdDirtyBits HdCyclesMaterial::GetInitialDirtyBitsMask() const
|
HdDirtyBits HdCyclesMaterial::GetInitialDirtyBitsMask() const
|
||||||
{
|
{
|
||||||
|
@ -22,9 +22,7 @@ class HdCyclesMaterial final : public PXR_NS::HdMaterial {
|
|||||||
PXR_NS::HdDirtyBits *dirtyBits) override;
|
PXR_NS::HdDirtyBits *dirtyBits) override;
|
||||||
|
|
||||||
#if PXR_VERSION < 2011
|
#if PXR_VERSION < 2011
|
||||||
void Reload() override
|
void Reload() override {}
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void Finalize(PXR_NS::HdRenderParam *renderParam) override;
|
void Finalize(PXR_NS::HdRenderParam *renderParam) override;
|
||||||
|
@ -94,9 +94,7 @@ HdCyclesMesh::HdCyclesMesh(const SdfPath &rprimId
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesMesh::~HdCyclesMesh()
|
HdCyclesMesh::~HdCyclesMesh() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdDirtyBits HdCyclesMesh::GetInitialDirtyBitsMask() const
|
HdDirtyBits HdCyclesMesh::GetInitialDirtyBitsMask() const
|
||||||
{
|
{
|
||||||
|
@ -35,9 +35,7 @@ HdCyclesPlugin::HdCyclesPlugin()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesPlugin::~HdCyclesPlugin()
|
HdCyclesPlugin::~HdCyclesPlugin() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HdCyclesPlugin::IsSupported() const
|
bool HdCyclesPlugin::IsSupported() const
|
||||||
{
|
{
|
||||||
|
@ -25,9 +25,7 @@ HdCyclesPoints::HdCyclesPoints(const SdfPath &rprimId
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesPoints::~HdCyclesPoints()
|
HdCyclesPoints::~HdCyclesPoints() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdDirtyBits HdCyclesPoints::GetInitialDirtyBitsMask() const
|
HdDirtyBits HdCyclesPoints::GetInitialDirtyBitsMask() const
|
||||||
{
|
{
|
||||||
|
@ -11,13 +11,9 @@
|
|||||||
|
|
||||||
HDCYCLES_NAMESPACE_OPEN_SCOPE
|
HDCYCLES_NAMESPACE_OPEN_SCOPE
|
||||||
|
|
||||||
HdCyclesRenderBuffer::HdCyclesRenderBuffer(const SdfPath &bprimId) : HdRenderBuffer(bprimId)
|
HdCyclesRenderBuffer::HdCyclesRenderBuffer(const SdfPath &bprimId) : HdRenderBuffer(bprimId) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdCyclesRenderBuffer::~HdCyclesRenderBuffer()
|
HdCyclesRenderBuffer::~HdCyclesRenderBuffer() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void HdCyclesRenderBuffer::Finalize(HdRenderParam *renderParam)
|
void HdCyclesRenderBuffer::Finalize(HdRenderParam *renderParam)
|
||||||
{
|
{
|
||||||
@ -94,9 +90,7 @@ bool HdCyclesRenderBuffer::IsMapped() const
|
|||||||
return _mapped != 0;
|
return _mapped != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HdCyclesRenderBuffer::Resolve()
|
void HdCyclesRenderBuffer::Resolve() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HdCyclesRenderBuffer::IsConverged() const
|
bool HdCyclesRenderBuffer::IsConverged() const
|
||||||
{
|
{
|
||||||
|
@ -131,9 +131,7 @@ HdCyclesDelegate::HdCyclesDelegate(const HdRenderSettingsMap &settingsMap,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesDelegate::~HdCyclesDelegate()
|
HdCyclesDelegate::~HdCyclesDelegate() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void HdCyclesDelegate::SetDrivers(const HdDriverVector &drivers)
|
void HdCyclesDelegate::SetDrivers(const HdDriverVector &drivers)
|
||||||
{
|
{
|
||||||
|
@ -176,8 +176,6 @@ void HdCyclesRenderPass::_Execute(const HdRenderPassStateSharedPtr &renderPassSt
|
|||||||
session->draw();
|
session->draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
void HdCyclesRenderPass::_MarkCollectionDirty()
|
void HdCyclesRenderPass::_MarkCollectionDirty() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HDCYCLES_NAMESPACE_CLOSE_SCOPE
|
HDCYCLES_NAMESPACE_CLOSE_SCOPE
|
||||||
|
@ -32,9 +32,7 @@ SceneLock::SceneLock(const HdRenderParam *renderParam)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
SceneLock::~SceneLock()
|
SceneLock::~SceneLock() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdCyclesSession::HdCyclesSession(Session *session_, const bool keep_nodes)
|
HdCyclesSession::HdCyclesSession(Session *session_, const bool keep_nodes)
|
||||||
: session(session_), keep_nodes(true), _ownCyclesSession(false)
|
: session(session_), keep_nodes(true), _ownCyclesSession(false)
|
||||||
|
@ -30,9 +30,7 @@ HdCyclesVolume::HdCyclesVolume(const SdfPath &rprimId
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
HdCyclesVolume::~HdCyclesVolume()
|
HdCyclesVolume::~HdCyclesVolume() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
HdDirtyBits HdCyclesVolume::GetInitialDirtyBitsMask() const
|
HdDirtyBits HdCyclesVolume::GetInitialDirtyBitsMask() const
|
||||||
{
|
{
|
||||||
|
@ -7,9 +7,7 @@
|
|||||||
|
|
||||||
CCL_NAMESPACE_BEGIN
|
CCL_NAMESPACE_BEGIN
|
||||||
|
|
||||||
AdaptiveSampling::AdaptiveSampling()
|
AdaptiveSampling::AdaptiveSampling() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int AdaptiveSampling::align_samples(int start_sample, int num_samples) const
|
int AdaptiveSampling::align_samples(int start_sample, int num_samples) const
|
||||||
{
|
{
|
||||||
|
@ -9,9 +9,7 @@
|
|||||||
|
|
||||||
CCL_NAMESPACE_BEGIN
|
CCL_NAMESPACE_BEGIN
|
||||||
|
|
||||||
PathTraceDisplay::PathTraceDisplay(unique_ptr<DisplayDriver> driver) : driver_(move(driver))
|
PathTraceDisplay::PathTraceDisplay(unique_ptr<DisplayDriver> driver) : driver_(move(driver)) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void PathTraceDisplay::reset(const BufferParams &buffer_params, const bool reset_rendering)
|
void PathTraceDisplay::reset(const BufferParams &buffer_params, const bool reset_rendering)
|
||||||
{
|
{
|
||||||
|
@ -44,9 +44,7 @@ PathTraceWork::PathTraceWork(Device *device,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
PathTraceWork::~PathTraceWork()
|
PathTraceWork::~PathTraceWork() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
RenderBuffers *PathTraceWork::get_render_buffers()
|
RenderBuffers *PathTraceWork::get_render_buffers()
|
||||||
{
|
{
|
||||||
|
@ -142,9 +142,7 @@ class PathTraceWork {
|
|||||||
|
|
||||||
#ifdef WITH_PATH_GUIDING
|
#ifdef WITH_PATH_GUIDING
|
||||||
/* Initializes the per-thread guiding kernel data. */
|
/* Initializes the per-thread guiding kernel data. */
|
||||||
virtual void guiding_init_kernel_globals(void *, void *, const bool)
|
virtual void guiding_init_kernel_globals(void *, void *, const bool) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -189,9 +189,7 @@ void PathTraceWorkCPU::copy_to_display(PathTraceDisplay *display,
|
|||||||
display->unmap_texture_buffer();
|
display->unmap_texture_buffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PathTraceWorkCPU::destroy_gpu_resources(PathTraceDisplay * /*display*/)
|
void PathTraceWorkCPU::destroy_gpu_resources(PathTraceDisplay * /*display*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PathTraceWorkCPU::copy_render_buffers_from_device()
|
bool PathTraceWorkCPU::copy_render_buffers_from_device()
|
||||||
{
|
{
|
||||||
|
@ -11,9 +11,7 @@
|
|||||||
|
|
||||||
CCL_NAMESPACE_BEGIN
|
CCL_NAMESPACE_BEGIN
|
||||||
|
|
||||||
WorkTileScheduler::WorkTileScheduler()
|
WorkTileScheduler::WorkTileScheduler() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void WorkTileScheduler::set_accelerated_rt(bool accelerated_rt)
|
void WorkTileScheduler::set_accelerated_rt(bool accelerated_rt)
|
||||||
{
|
{
|
||||||
|
@ -43,9 +43,7 @@ ccl_device int bsdf_diffuse_ramp_setup(DiffuseRampBsdf *bsdf)
|
|||||||
return SD_BSDF | SD_BSDF_HAS_EVAL;
|
return SD_BSDF | SD_BSDF_HAS_EVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
ccl_device void bsdf_diffuse_ramp_blur(ccl_private ShaderClosure *sc, float roughness)
|
ccl_device void bsdf_diffuse_ramp_blur(ccl_private ShaderClosure *sc, float roughness) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device Spectrum bsdf_diffuse_ramp_eval(ccl_private const ShaderClosure *sc,
|
ccl_device Spectrum bsdf_diffuse_ramp_eval(ccl_private const ShaderClosure *sc,
|
||||||
const float3 wi,
|
const float3 wi,
|
||||||
|
@ -256,13 +256,9 @@ ccl_device_extern ccl_private OSLClosure *osl_allocate_weighted_closure_componen
|
|||||||
#include "kernel/svm/math_util.h"
|
#include "kernel/svm/math_util.h"
|
||||||
#include "kernel/util/color.h"
|
#include "kernel/util/color.h"
|
||||||
|
|
||||||
ccl_device_extern void osl_error(ccl_private ShaderGlobals *sg, const char *format, void *args)
|
ccl_device_extern void osl_error(ccl_private ShaderGlobals *sg, const char *format, void *args) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_printf(ccl_private ShaderGlobals *sg, const char *format, void *args)
|
ccl_device_extern void osl_printf(ccl_private ShaderGlobals *sg, const char *format, void *args) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_warning(ccl_private ShaderGlobals *sg, const char *format, void *args)
|
ccl_device_extern void osl_warning(ccl_private ShaderGlobals *sg, const char *format, void *args)
|
||||||
{
|
{
|
||||||
@ -1456,65 +1452,35 @@ ccl_device_extern void osl_texture_set_firstchannel(ccl_private OSLTextureOption
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_swrap_code(ccl_private OSLTextureOptions *opt, int mode)
|
ccl_device_extern void osl_texture_set_swrap_code(ccl_private OSLTextureOptions *opt, int mode) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_twrap_code(ccl_private OSLTextureOptions *opt, int mode)
|
ccl_device_extern void osl_texture_set_twrap_code(ccl_private OSLTextureOptions *opt, int mode) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_rwrap_code(ccl_private OSLTextureOptions *opt, int mode)
|
ccl_device_extern void osl_texture_set_rwrap_code(ccl_private OSLTextureOptions *opt, int mode) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_stwrap_code(ccl_private OSLTextureOptions *opt, int mode)
|
ccl_device_extern void osl_texture_set_stwrap_code(ccl_private OSLTextureOptions *opt, int mode) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_sblur(ccl_private OSLTextureOptions *opt, float blur)
|
ccl_device_extern void osl_texture_set_sblur(ccl_private OSLTextureOptions *opt, float blur) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_tblur(ccl_private OSLTextureOptions *opt, float blur)
|
ccl_device_extern void osl_texture_set_tblur(ccl_private OSLTextureOptions *opt, float blur) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_rblur(ccl_private OSLTextureOptions *opt, float blur)
|
ccl_device_extern void osl_texture_set_rblur(ccl_private OSLTextureOptions *opt, float blur) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_stblur(ccl_private OSLTextureOptions *opt, float blur)
|
ccl_device_extern void osl_texture_set_stblur(ccl_private OSLTextureOptions *opt, float blur) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_swidth(ccl_private OSLTextureOptions *opt, float width)
|
ccl_device_extern void osl_texture_set_swidth(ccl_private OSLTextureOptions *opt, float width) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_twidth(ccl_private OSLTextureOptions *opt, float width)
|
ccl_device_extern void osl_texture_set_twidth(ccl_private OSLTextureOptions *opt, float width) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_rwidth(ccl_private OSLTextureOptions *opt, float width)
|
ccl_device_extern void osl_texture_set_rwidth(ccl_private OSLTextureOptions *opt, float width) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_stwidth(ccl_private OSLTextureOptions *opt, float width)
|
ccl_device_extern void osl_texture_set_stwidth(ccl_private OSLTextureOptions *opt, float width) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_fill(ccl_private OSLTextureOptions *opt, float fill)
|
ccl_device_extern void osl_texture_set_fill(ccl_private OSLTextureOptions *opt, float fill) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_time(ccl_private OSLTextureOptions *opt, float time)
|
ccl_device_extern void osl_texture_set_time(ccl_private OSLTextureOptions *opt, float time) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_interp_code(ccl_private OSLTextureOptions *opt, int mode)
|
ccl_device_extern void osl_texture_set_interp_code(ccl_private OSLTextureOptions *opt, int mode) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ccl_device_extern void osl_texture_set_subimage(ccl_private OSLTextureOptions *opt, int subimage)
|
ccl_device_extern void osl_texture_set_subimage(ccl_private OSLTextureOptions *opt, int subimage)
|
||||||
{
|
{
|
||||||
|
@ -3,6 +3,4 @@
|
|||||||
|
|
||||||
#include "stdcycles.h"
|
#include "stdcycles.h"
|
||||||
|
|
||||||
shader node_holdout(output closure color Holdout = holdout())
|
shader node_holdout(output closure color Holdout = holdout()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
@ -433,9 +433,7 @@ AlembicObject::AlembicObject() : Node(get_node_type())
|
|||||||
schema_type = INVALID;
|
schema_type = INVALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
AlembicObject::~AlembicObject()
|
AlembicObject::~AlembicObject() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void AlembicObject::set_object(Object *object_)
|
void AlembicObject::set_object(Object *object_)
|
||||||
{
|
{
|
||||||
|
@ -460,9 +460,7 @@ AttributeSet::AttributeSet(Geometry *geometry, AttributePrimitive prim)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
AttributeSet::~AttributeSet()
|
AttributeSet::~AttributeSet() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Attribute *AttributeSet::add(ustring name, TypeDesc type, AttributeElement element)
|
Attribute *AttributeSet::add(ustring name, TypeDesc type, AttributeElement element)
|
||||||
{
|
{
|
||||||
@ -842,13 +840,9 @@ AttributeRequest::AttributeRequest(AttributeStandard std_)
|
|||||||
|
|
||||||
/* AttributeRequestSet */
|
/* AttributeRequestSet */
|
||||||
|
|
||||||
AttributeRequestSet::AttributeRequestSet()
|
AttributeRequestSet::AttributeRequestSet() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
AttributeRequestSet::~AttributeRequestSet()
|
AttributeRequestSet::~AttributeRequestSet() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool AttributeRequestSet::modified(const AttributeRequestSet &other)
|
bool AttributeRequestSet::modified(const AttributeRequestSet &other)
|
||||||
{
|
{
|
||||||
|
@ -116,9 +116,7 @@ void Background::device_update(Device *device, DeviceScene *dscene, Scene *scene
|
|||||||
clear_modified();
|
clear_modified();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Background::device_free(Device * /*device*/, DeviceScene * /*dscene*/)
|
void Background::device_free(Device * /*device*/, DeviceScene * /*dscene*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Background::tag_update(Scene *scene)
|
void Background::tag_update(Scene *scene)
|
||||||
{
|
{
|
||||||
|
@ -19,9 +19,7 @@ BakeManager::BakeManager()
|
|||||||
use_camera_ = false;
|
use_camera_ = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
BakeManager::~BakeManager()
|
BakeManager::~BakeManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool BakeManager::get_baking() const
|
bool BakeManager::get_baking() const
|
||||||
{
|
{
|
||||||
@ -85,9 +83,7 @@ void BakeManager::device_update(Device * /*device*/,
|
|||||||
need_update_ = false;
|
need_update_ = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BakeManager::device_free(Device * /*device*/, DeviceScene * /*dscene*/)
|
void BakeManager::device_free(Device * /*device*/, DeviceScene * /*dscene*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BakeManager::tag_update()
|
void BakeManager::tag_update()
|
||||||
{
|
{
|
||||||
|
@ -188,9 +188,7 @@ Camera::Camera() : Node(get_node_type())
|
|||||||
memset((void *)&kernel_camera, 0, sizeof(kernel_camera));
|
memset((void *)&kernel_camera, 0, sizeof(kernel_camera));
|
||||||
}
|
}
|
||||||
|
|
||||||
Camera::~Camera()
|
Camera::~Camera() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Camera::compute_auto_viewplane()
|
void Camera::compute_auto_viewplane()
|
||||||
{
|
{
|
||||||
|
@ -123,13 +123,9 @@ NODE_DEFINE(Film)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
Film::Film() : Node(get_node_type()), filter_table_offset_(TABLE_OFFSET_INVALID)
|
Film::Film() : Node(get_node_type()), filter_table_offset_(TABLE_OFFSET_INVALID) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Film::~Film()
|
Film::~Film() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Film::add_default(Scene *scene)
|
void Film::add_default(Scene *scene)
|
||||||
{
|
{
|
||||||
|
@ -301,9 +301,7 @@ GeometryManager::GeometryManager()
|
|||||||
need_flags_update = true;
|
need_flags_update = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
GeometryManager::~GeometryManager()
|
GeometryManager::~GeometryManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void GeometryManager::update_osl_globals(Device *device, Scene *scene)
|
void GeometryManager::update_osl_globals(Device *device, Scene *scene)
|
||||||
{
|
{
|
||||||
|
@ -313,9 +313,7 @@ Hair::Hair() : Geometry(get_node_type(), Geometry::HAIR)
|
|||||||
curve_shape = CURVE_RIBBON;
|
curve_shape = CURVE_RIBBON;
|
||||||
}
|
}
|
||||||
|
|
||||||
Hair::~Hair()
|
Hair::~Hair() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Hair::resize_curves(int numcurves, int numkeys)
|
void Hair::resize_curves(int numcurves, int numkeys)
|
||||||
{
|
{
|
||||||
|
@ -80,9 +80,7 @@ const char *name_from_type(ImageDataType type)
|
|||||||
|
|
||||||
/* Image Handle */
|
/* Image Handle */
|
||||||
|
|
||||||
ImageHandle::ImageHandle() : manager(NULL)
|
ImageHandle::ImageHandle() : manager(NULL) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ImageHandle::ImageHandle(const ImageHandle &other)
|
ImageHandle::ImageHandle(const ImageHandle &other)
|
||||||
: tile_slots(other.tile_slots), manager(other.manager)
|
: tile_slots(other.tile_slots), manager(other.manager)
|
||||||
@ -290,9 +288,7 @@ void ImageMetaData::detect_colorspace()
|
|||||||
|
|
||||||
/* Image Loader */
|
/* Image Loader */
|
||||||
|
|
||||||
ImageLoader::ImageLoader()
|
ImageLoader::ImageLoader() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ustring ImageLoader::osl_filepath() const
|
ustring ImageLoader::osl_filepath() const
|
||||||
{
|
{
|
||||||
|
@ -9,13 +9,9 @@
|
|||||||
|
|
||||||
CCL_NAMESPACE_BEGIN
|
CCL_NAMESPACE_BEGIN
|
||||||
|
|
||||||
OIIOImageLoader::OIIOImageLoader(const string &filepath) : filepath(filepath)
|
OIIOImageLoader::OIIOImageLoader(const string &filepath) : filepath(filepath) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
OIIOImageLoader::~OIIOImageLoader()
|
OIIOImageLoader::~OIIOImageLoader() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool OIIOImageLoader::load_metadata(const ImageDeviceFeatures & /*features*/,
|
bool OIIOImageLoader::load_metadata(const ImageDeviceFeatures & /*features*/,
|
||||||
ImageMetaData &metadata)
|
ImageMetaData &metadata)
|
||||||
|
@ -87,13 +87,9 @@ VDBImageLoader::VDBImageLoader(openvdb::GridBase::ConstPtr grid_, const string &
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
VDBImageLoader::VDBImageLoader(const string &grid_name) : grid_name(grid_name)
|
VDBImageLoader::VDBImageLoader(const string &grid_name) : grid_name(grid_name) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
VDBImageLoader::~VDBImageLoader()
|
VDBImageLoader::~VDBImageLoader() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool VDBImageLoader::load_metadata(const ImageDeviceFeatures &features, ImageMetaData &metadata)
|
bool VDBImageLoader::load_metadata(const ImageDeviceFeatures &features, ImageMetaData &metadata)
|
||||||
{
|
{
|
||||||
|
@ -139,13 +139,9 @@ NODE_DEFINE(Integrator)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
Integrator::Integrator() : Node(get_node_type())
|
Integrator::Integrator() : Node(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Integrator::~Integrator()
|
Integrator::~Integrator() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene)
|
void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene)
|
||||||
{
|
{
|
||||||
|
@ -23,9 +23,7 @@ struct OrientationBounds {
|
|||||||
float theta_o; /* angle bounding the normals */
|
float theta_o; /* angle bounding the normals */
|
||||||
float theta_e; /* angle bounding the light emissions */
|
float theta_e; /* angle bounding the light emissions */
|
||||||
|
|
||||||
__forceinline OrientationBounds()
|
__forceinline OrientationBounds() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
__forceinline OrientationBounds(const float3 &axis_, float theta_o_, float theta_e_)
|
__forceinline OrientationBounds(const float3 &axis_, float theta_o_, float theta_e_)
|
||||||
: axis(axis_), theta_o(theta_o_), theta_e(theta_e_)
|
: axis(axis_), theta_o(theta_o_), theta_e(theta_e_)
|
||||||
@ -69,9 +67,7 @@ struct LightTreePrimitivesMeasure {
|
|||||||
|
|
||||||
__forceinline LightTreePrimitivesMeasure() = default;
|
__forceinline LightTreePrimitivesMeasure() = default;
|
||||||
|
|
||||||
__forceinline LightTreePrimitivesMeasure(empty_t)
|
__forceinline LightTreePrimitivesMeasure(empty_t) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
__forceinline LightTreePrimitivesMeasure(const BoundBox &bbox,
|
__forceinline LightTreePrimitivesMeasure(const BoundBox &bbox,
|
||||||
const OrientationBounds &bcone,
|
const OrientationBounds &bcone,
|
||||||
|
@ -192,9 +192,7 @@ Mesh::Mesh(const NodeType *node_type, Type geom_type_)
|
|||||||
patch_table = NULL;
|
patch_table = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
Mesh::Mesh() : Mesh(get_node_type(), Geometry::MESH)
|
Mesh::Mesh() : Mesh(get_node_type(), Geometry::MESH) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Mesh::~Mesh()
|
Mesh::~Mesh()
|
||||||
{
|
{
|
||||||
|
@ -150,9 +150,7 @@ using namespace OpenSubdiv;
|
|||||||
template<typename T> struct OsdValue {
|
template<typename T> struct OsdValue {
|
||||||
T value;
|
T value;
|
||||||
|
|
||||||
OsdValue()
|
OsdValue() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Clear(void * = 0)
|
void Clear(void * = 0)
|
||||||
{
|
{
|
||||||
@ -182,9 +180,7 @@ class OsdData {
|
|||||||
Far::PatchMap *patch_map;
|
Far::PatchMap *patch_map;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
OsdData() : mesh(NULL), refiner(NULL), patch_table(NULL), patch_map(NULL)
|
OsdData() : mesh(NULL), refiner(NULL), patch_table(NULL), patch_map(NULL) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
~OsdData()
|
~OsdData()
|
||||||
{
|
{
|
||||||
@ -353,12 +349,8 @@ class OsdData {
|
|||||||
struct OsdPatch : Patch {
|
struct OsdPatch : Patch {
|
||||||
OsdData *osd_data;
|
OsdData *osd_data;
|
||||||
|
|
||||||
OsdPatch()
|
OsdPatch() {}
|
||||||
{
|
OsdPatch(OsdData *data) : osd_data(data) {}
|
||||||
}
|
|
||||||
OsdPatch(OsdData *data) : osd_data(data)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void eval(float3 *P, float3 *dPdu, float3 *dPdv, float3 *N, float u, float v)
|
void eval(float3 *P, float3 *dPdu, float3 *dPdv, float3 *N, float u, float v)
|
||||||
{
|
{
|
||||||
|
@ -113,9 +113,7 @@ Object::Object() : Node(get_node_type())
|
|||||||
intersects_volume = false;
|
intersects_volume = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Object::~Object()
|
Object::~Object() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Object::update_motion()
|
void Object::update_motion()
|
||||||
{
|
{
|
||||||
@ -380,9 +378,7 @@ ObjectManager::ObjectManager()
|
|||||||
need_flags_update = true;
|
need_flags_update = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ObjectManager::~ObjectManager()
|
ObjectManager::~ObjectManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static float object_volume_density(const Transform &tfm, Geometry *geom)
|
static float object_volume_density(const Transform &tfm, Geometry *geom)
|
||||||
{
|
{
|
||||||
|
@ -1348,57 +1348,31 @@ void OSLCompiler::parameter_texture_ies(const char *name, int svm_slot)
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
void OSLCompiler::add(ShaderNode * /*node*/, const char * /*name*/, bool /*isfilepath*/)
|
void OSLCompiler::add(ShaderNode * /*node*/, const char * /*name*/, bool /*isfilepath*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter(ShaderNode * /*node*/, const char * /*name*/)
|
void OSLCompiler::parameter(ShaderNode * /*node*/, const char * /*name*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter(const char * /*name*/, float /*f*/)
|
void OSLCompiler::parameter(const char * /*name*/, float /*f*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter_color(const char * /*name*/, float3 /*f*/)
|
void OSLCompiler::parameter_color(const char * /*name*/, float3 /*f*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter_vector(const char * /*name*/, float3 /*f*/)
|
void OSLCompiler::parameter_vector(const char * /*name*/, float3 /*f*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter_point(const char * /*name*/, float3 /*f*/)
|
void OSLCompiler::parameter_point(const char * /*name*/, float3 /*f*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter_normal(const char * /*name*/, float3 /*f*/)
|
void OSLCompiler::parameter_normal(const char * /*name*/, float3 /*f*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter(const char * /*name*/, int /*f*/)
|
void OSLCompiler::parameter(const char * /*name*/, int /*f*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter(const char * /*name*/, const char * /*s*/)
|
void OSLCompiler::parameter(const char * /*name*/, const char * /*s*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter(const char * /*name*/, ustring /*s*/)
|
void OSLCompiler::parameter(const char * /*name*/, ustring /*s*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter(const char * /*name*/, const Transform & /*tfm*/)
|
void OSLCompiler::parameter(const char * /*name*/, const Transform & /*tfm*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter_array(const char * /*name*/, const float /*f*/[], int /*arraylen*/)
|
void OSLCompiler::parameter_array(const char * /*name*/, const float /*f*/[], int /*arraylen*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter_color_array(const char * /*name*/, const array<float3> & /*f*/)
|
void OSLCompiler::parameter_color_array(const char * /*name*/, const array<float3> & /*f*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter_texture(const char * /* name */,
|
void OSLCompiler::parameter_texture(const char * /* name */,
|
||||||
ustring /* filename */,
|
ustring /* filename */,
|
||||||
@ -1406,13 +1380,9 @@ void OSLCompiler::parameter_texture(const char * /* name */,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSLCompiler::parameter_texture(const char * /* name */, const ImageHandle & /*handle*/)
|
void OSLCompiler::parameter_texture(const char * /* name */, const ImageHandle & /*handle*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OSLCompiler::parameter_texture_ies(const char * /* name */, int /* svm_slot */)
|
void OSLCompiler::parameter_texture_ies(const char * /* name */, int /* svm_slot */) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* WITH_OSL */
|
#endif /* WITH_OSL */
|
||||||
|
|
||||||
|
@ -23,13 +23,9 @@ NODE_DEFINE(ParticleSystem)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParticleSystem::ParticleSystem() : Node(get_node_type())
|
ParticleSystem::ParticleSystem() : Node(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ParticleSystem::~ParticleSystem()
|
ParticleSystem::~ParticleSystem() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ParticleSystem::tag_update(Scene *scene)
|
void ParticleSystem::tag_update(Scene *scene)
|
||||||
{
|
{
|
||||||
@ -43,9 +39,7 @@ ParticleSystemManager::ParticleSystemManager()
|
|||||||
need_update_ = true;
|
need_update_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParticleSystemManager::~ParticleSystemManager()
|
ParticleSystemManager::~ParticleSystemManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ParticleSystemManager::device_update_particles(Device *,
|
void ParticleSystemManager::device_update_particles(Device *,
|
||||||
DeviceScene *dscene,
|
DeviceScene *dscene,
|
||||||
|
@ -134,9 +134,7 @@ NODE_DEFINE(Pass)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
Pass::Pass() : Node(get_node_type()), is_auto_(false)
|
Pass::Pass() : Node(get_node_type()), is_auto_(false) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
PassInfo Pass::get_info() const
|
PassInfo Pass::get_info() const
|
||||||
{
|
{
|
||||||
|
@ -93,13 +93,9 @@ NODE_DEFINE(PointCloud)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
PointCloud::PointCloud() : Geometry(node_type, Geometry::POINTCLOUD)
|
PointCloud::PointCloud() : Geometry(node_type, Geometry::POINTCLOUD) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
PointCloud::~PointCloud()
|
PointCloud::~PointCloud() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void PointCloud::resize(int numpoints)
|
void PointCloud::resize(int numpoints)
|
||||||
{
|
{
|
||||||
|
@ -16,22 +16,16 @@ NODE_ABSTRACT_DEFINE(Procedural)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
Procedural::Procedural(const NodeType *type) : Node(type)
|
Procedural::Procedural(const NodeType *type) : Node(type) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Procedural::~Procedural()
|
Procedural::~Procedural() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ProceduralManager::ProceduralManager()
|
ProceduralManager::ProceduralManager()
|
||||||
{
|
{
|
||||||
need_update_ = true;
|
need_update_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ProceduralManager::~ProceduralManager()
|
ProceduralManager::~ProceduralManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ProceduralManager::update(Scene *scene, Progress &progress)
|
void ProceduralManager::update(Scene *scene, Progress &progress)
|
||||||
{
|
{
|
||||||
|
@ -397,9 +397,7 @@ ShaderManager::ShaderManager()
|
|||||||
init_xyz_transforms();
|
init_xyz_transforms();
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderManager::~ShaderManager()
|
ShaderManager::~ShaderManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ShaderManager *ShaderManager::create(int shadingsystem, Device *device)
|
ShaderManager *ShaderManager::create(int shadingsystem, Device *device)
|
||||||
{
|
{
|
||||||
|
@ -160,15 +160,11 @@ class ShaderNode : public Node {
|
|||||||
virtual void compile(OSLCompiler &compiler) = 0;
|
virtual void compile(OSLCompiler &compiler) = 0;
|
||||||
|
|
||||||
/* Expand node into additional nodes. */
|
/* Expand node into additional nodes. */
|
||||||
virtual void expand(ShaderGraph * /* graph */)
|
virtual void expand(ShaderGraph * /* graph */) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ** Node optimization ** */
|
/* ** Node optimization ** */
|
||||||
/* Check whether the node can be replaced with single constant. */
|
/* Check whether the node can be replaced with single constant. */
|
||||||
virtual void constant_fold(const ConstantFolder & /*folder*/)
|
virtual void constant_fold(const ConstantFolder & /*folder*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Simplify settings used by artists to the ones which are simpler to
|
/* Simplify settings used by artists to the ones which are simpler to
|
||||||
* evaluate in the kernel but keep the final result unchanged.
|
* evaluate in the kernel but keep the final result unchanged.
|
||||||
|
@ -64,9 +64,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
mapping_projection_enum.insert("sphere", TextureMapping::SPHERE); \
|
mapping_projection_enum.insert("sphere", TextureMapping::SPHERE); \
|
||||||
SOCKET_ENUM(tex_mapping.projection, "Projection", mapping_projection_enum, TextureMapping::FLAT);
|
SOCKET_ENUM(tex_mapping.projection, "Projection", mapping_projection_enum, TextureMapping::FLAT);
|
||||||
|
|
||||||
TextureMapping::TextureMapping()
|
TextureMapping::TextureMapping() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Transform TextureMapping::compute_transform()
|
Transform TextureMapping::compute_transform()
|
||||||
{
|
{
|
||||||
@ -873,9 +871,7 @@ NODE_DEFINE(SkyTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
SkyTextureNode::SkyTextureNode() : TextureNode(get_node_type())
|
SkyTextureNode::SkyTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SkyTextureNode::compile(SVMCompiler &compiler)
|
void SkyTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1055,9 +1051,7 @@ NODE_DEFINE(GradientTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
GradientTextureNode::GradientTextureNode() : TextureNode(get_node_type())
|
GradientTextureNode::GradientTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void GradientTextureNode::compile(SVMCompiler &compiler)
|
void GradientTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1112,9 +1106,7 @@ NODE_DEFINE(NoiseTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
NoiseTextureNode::NoiseTextureNode() : TextureNode(get_node_type())
|
NoiseTextureNode::NoiseTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void NoiseTextureNode::compile(SVMCompiler &compiler)
|
void NoiseTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1205,9 +1197,7 @@ NODE_DEFINE(VoronoiTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VoronoiTextureNode::VoronoiTextureNode() : TextureNode(get_node_type())
|
VoronoiTextureNode::VoronoiTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VoronoiTextureNode::compile(SVMCompiler &compiler)
|
void VoronoiTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1376,9 +1366,7 @@ NODE_DEFINE(WhiteNoiseTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
WhiteNoiseTextureNode::WhiteNoiseTextureNode() : ShaderNode(get_node_type())
|
WhiteNoiseTextureNode::WhiteNoiseTextureNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void WhiteNoiseTextureNode::compile(SVMCompiler &compiler)
|
void WhiteNoiseTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1441,9 +1429,7 @@ NODE_DEFINE(MusgraveTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MusgraveTextureNode::MusgraveTextureNode() : TextureNode(get_node_type())
|
MusgraveTextureNode::MusgraveTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MusgraveTextureNode::compile(SVMCompiler &compiler)
|
void MusgraveTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1539,9 +1525,7 @@ NODE_DEFINE(WaveTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
WaveTextureNode::WaveTextureNode() : TextureNode(get_node_type())
|
WaveTextureNode::WaveTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void WaveTextureNode::compile(SVMCompiler &compiler)
|
void WaveTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1616,9 +1600,7 @@ NODE_DEFINE(MagicTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MagicTextureNode::MagicTextureNode() : TextureNode(get_node_type())
|
MagicTextureNode::MagicTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MagicTextureNode::compile(SVMCompiler &compiler)
|
void MagicTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1669,9 +1651,7 @@ NODE_DEFINE(CheckerTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckerTextureNode::CheckerTextureNode() : TextureNode(get_node_type())
|
CheckerTextureNode::CheckerTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CheckerTextureNode::compile(SVMCompiler &compiler)
|
void CheckerTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1735,9 +1715,7 @@ NODE_DEFINE(BrickTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
BrickTextureNode::BrickTextureNode() : TextureNode(get_node_type())
|
BrickTextureNode::BrickTextureNode() : TextureNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BrickTextureNode::compile(SVMCompiler &compiler)
|
void BrickTextureNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1828,13 +1806,9 @@ NODE_DEFINE(PointDensityTextureNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
PointDensityTextureNode::PointDensityTextureNode() : ShaderNode(get_node_type())
|
PointDensityTextureNode::PointDensityTextureNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
PointDensityTextureNode::~PointDensityTextureNode()
|
PointDensityTextureNode::~PointDensityTextureNode() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ShaderNode *PointDensityTextureNode::clone(ShaderGraph *graph) const
|
ShaderNode *PointDensityTextureNode::clone(ShaderGraph *graph) const
|
||||||
{
|
{
|
||||||
@ -1945,9 +1919,7 @@ NODE_DEFINE(NormalNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
NormalNode::NormalNode() : ShaderNode(get_node_type())
|
NormalNode::NormalNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void NormalNode::compile(SVMCompiler &compiler)
|
void NormalNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -1992,9 +1964,7 @@ NODE_DEFINE(MappingNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MappingNode::MappingNode() : ShaderNode(get_node_type())
|
MappingNode::MappingNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MappingNode::constant_fold(const ConstantFolder &folder)
|
void MappingNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -2047,9 +2017,7 @@ NODE_DEFINE(RGBToBWNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
RGBToBWNode::RGBToBWNode() : ShaderNode(get_node_type())
|
RGBToBWNode::RGBToBWNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void RGBToBWNode::constant_fold(const ConstantFolder &folder)
|
void RGBToBWNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -2295,9 +2263,7 @@ bool BsdfBaseNode::has_bump()
|
|||||||
|
|
||||||
/* BSDF Closure */
|
/* BSDF Closure */
|
||||||
|
|
||||||
BsdfNode::BsdfNode(const NodeType *node_type) : BsdfBaseNode(node_type)
|
BsdfNode::BsdfNode(const NodeType *node_type) : BsdfBaseNode(node_type) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BsdfNode::compile(SVMCompiler &compiler,
|
void BsdfNode::compile(SVMCompiler &compiler,
|
||||||
ShaderInput *param1,
|
ShaderInput *param1,
|
||||||
@ -3176,9 +3142,7 @@ NODE_DEFINE(EmissionNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
EmissionNode::EmissionNode() : ShaderNode(get_node_type())
|
EmissionNode::EmissionNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void EmissionNode::compile(SVMCompiler &compiler)
|
void EmissionNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -3225,9 +3189,7 @@ NODE_DEFINE(BackgroundNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
BackgroundNode::BackgroundNode() : ShaderNode(get_node_type())
|
BackgroundNode::BackgroundNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BackgroundNode::compile(SVMCompiler &compiler)
|
void BackgroundNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -3273,9 +3235,7 @@ NODE_DEFINE(HoldoutNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
HoldoutNode::HoldoutNode() : ShaderNode(get_node_type())
|
HoldoutNode::HoldoutNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void HoldoutNode::compile(SVMCompiler &compiler)
|
void HoldoutNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -3311,9 +3271,7 @@ NODE_DEFINE(AmbientOcclusionNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
AmbientOcclusionNode::AmbientOcclusionNode() : ShaderNode(get_node_type())
|
AmbientOcclusionNode::AmbientOcclusionNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void AmbientOcclusionNode::compile(SVMCompiler &compiler)
|
void AmbientOcclusionNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -3883,9 +3841,7 @@ NODE_DEFINE(TextureCoordinateNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
TextureCoordinateNode::TextureCoordinateNode() : ShaderNode(get_node_type())
|
TextureCoordinateNode::TextureCoordinateNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void TextureCoordinateNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void TextureCoordinateNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -4030,9 +3986,7 @@ NODE_DEFINE(UVMapNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
UVMapNode::UVMapNode() : ShaderNode(get_node_type())
|
UVMapNode::UVMapNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void UVMapNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void UVMapNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -4119,9 +4073,7 @@ NODE_DEFINE(LightPathNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
LightPathNode::LightPathNode() : ShaderNode(get_node_type())
|
LightPathNode::LightPathNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void LightPathNode::compile(SVMCompiler &compiler)
|
void LightPathNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -4219,9 +4171,7 @@ NODE_DEFINE(LightFalloffNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
LightFalloffNode::LightFalloffNode() : ShaderNode(get_node_type())
|
LightFalloffNode::LightFalloffNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void LightFalloffNode::compile(SVMCompiler &compiler)
|
void LightFalloffNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -4277,9 +4227,7 @@ NODE_DEFINE(ObjectInfoNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
ObjectInfoNode::ObjectInfoNode() : ShaderNode(get_node_type())
|
ObjectInfoNode::ObjectInfoNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ObjectInfoNode::compile(SVMCompiler &compiler)
|
void ObjectInfoNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -4340,9 +4288,7 @@ NODE_DEFINE(ParticleInfoNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParticleInfoNode::ParticleInfoNode() : ShaderNode(get_node_type())
|
ParticleInfoNode::ParticleInfoNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ParticleInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void ParticleInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -4445,9 +4391,7 @@ NODE_DEFINE(HairInfoNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
HairInfoNode::HairInfoNode() : ShaderNode(get_node_type())
|
HairInfoNode::HairInfoNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void HairInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void HairInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -4523,9 +4467,7 @@ NODE_DEFINE(PointInfoNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
PointInfoNode::PointInfoNode() : ShaderNode(get_node_type())
|
PointInfoNode::PointInfoNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void PointInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void PointInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -4577,9 +4519,7 @@ NODE_DEFINE(VolumeInfoNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VolumeInfoNode::VolumeInfoNode() : ShaderNode(get_node_type())
|
VolumeInfoNode::VolumeInfoNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The requested attributes are not updated after node expansion.
|
/* The requested attributes are not updated after node expansion.
|
||||||
* So we explicitly request the required attributes.
|
* So we explicitly request the required attributes.
|
||||||
@ -4639,13 +4579,9 @@ void VolumeInfoNode::expand(ShaderGraph *graph)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void VolumeInfoNode::compile(SVMCompiler &)
|
void VolumeInfoNode::compile(SVMCompiler &) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VolumeInfoNode::compile(OSLCompiler &)
|
void VolumeInfoNode::compile(OSLCompiler &) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
NODE_DEFINE(VertexColorNode)
|
NODE_DEFINE(VertexColorNode)
|
||||||
{
|
{
|
||||||
@ -4658,9 +4594,7 @@ NODE_DEFINE(VertexColorNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VertexColorNode::VertexColorNode() : ShaderNode(get_node_type())
|
VertexColorNode::VertexColorNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VertexColorNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void VertexColorNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -4739,9 +4673,7 @@ NODE_DEFINE(ValueNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
ValueNode::ValueNode() : ShaderNode(get_node_type())
|
ValueNode::ValueNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ValueNode::constant_fold(const ConstantFolder &folder)
|
void ValueNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -4773,9 +4705,7 @@ NODE_DEFINE(ColorNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
ColorNode::ColorNode() : ShaderNode(get_node_type())
|
ColorNode::ColorNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ColorNode::constant_fold(const ConstantFolder &folder)
|
void ColorNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -4910,9 +4840,7 @@ NODE_DEFINE(MixClosureWeightNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MixClosureWeightNode::MixClosureWeightNode() : ShaderNode(get_node_type())
|
MixClosureWeightNode::MixClosureWeightNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MixClosureWeightNode::compile(SVMCompiler &compiler)
|
void MixClosureWeightNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -4947,9 +4875,7 @@ NODE_DEFINE(InvertNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
InvertNode::InvertNode() : ShaderNode(get_node_type())
|
InvertNode::InvertNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void InvertNode::constant_fold(const ConstantFolder &folder)
|
void InvertNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5024,9 +4950,7 @@ NODE_DEFINE(MixNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MixNode::MixNode() : ShaderNode(get_node_type())
|
MixNode::MixNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MixNode::compile(SVMCompiler &compiler)
|
void MixNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -5103,9 +5027,7 @@ NODE_DEFINE(MixColorNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MixColorNode::MixColorNode() : ShaderNode(get_node_type())
|
MixColorNode::MixColorNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MixColorNode::compile(SVMCompiler &compiler)
|
void MixColorNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -5161,9 +5083,7 @@ NODE_DEFINE(MixFloatNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MixFloatNode::MixFloatNode() : ShaderNode(get_node_type())
|
MixFloatNode::MixFloatNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MixFloatNode::compile(SVMCompiler &compiler)
|
void MixFloatNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -5218,9 +5138,7 @@ NODE_DEFINE(MixVectorNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MixVectorNode::MixVectorNode() : ShaderNode(get_node_type())
|
MixVectorNode::MixVectorNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MixVectorNode::compile(SVMCompiler &compiler)
|
void MixVectorNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -5274,9 +5192,7 @@ NODE_DEFINE(MixVectorNonUniformNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MixVectorNonUniformNode::MixVectorNonUniformNode() : ShaderNode(get_node_type())
|
MixVectorNonUniformNode::MixVectorNonUniformNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MixVectorNonUniformNode::compile(SVMCompiler &compiler)
|
void MixVectorNonUniformNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -5332,9 +5248,7 @@ NODE_DEFINE(CombineColorNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
CombineColorNode::CombineColorNode() : ShaderNode(get_node_type())
|
CombineColorNode::CombineColorNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CombineColorNode::constant_fold(const ConstantFolder &folder)
|
void CombineColorNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5383,9 +5297,7 @@ NODE_DEFINE(CombineRGBNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
CombineRGBNode::CombineRGBNode() : ShaderNode(get_node_type())
|
CombineRGBNode::CombineRGBNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CombineRGBNode::constant_fold(const ConstantFolder &folder)
|
void CombineRGBNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5431,9 +5343,7 @@ NODE_DEFINE(CombineXYZNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
CombineXYZNode::CombineXYZNode() : ShaderNode(get_node_type())
|
CombineXYZNode::CombineXYZNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CombineXYZNode::constant_fold(const ConstantFolder &folder)
|
void CombineXYZNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5479,9 +5389,7 @@ NODE_DEFINE(CombineHSVNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
CombineHSVNode::CombineHSVNode() : ShaderNode(get_node_type())
|
CombineHSVNode::CombineHSVNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CombineHSVNode::constant_fold(const ConstantFolder &folder)
|
void CombineHSVNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5522,9 +5430,7 @@ NODE_DEFINE(GammaNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
GammaNode::GammaNode() : ShaderNode(get_node_type())
|
GammaNode::GammaNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void GammaNode::constant_fold(const ConstantFolder &folder)
|
void GammaNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5578,9 +5484,7 @@ NODE_DEFINE(BrightContrastNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
BrightContrastNode::BrightContrastNode() : ShaderNode(get_node_type())
|
BrightContrastNode::BrightContrastNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BrightContrastNode::constant_fold(const ConstantFolder &folder)
|
void BrightContrastNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5629,9 +5533,7 @@ NODE_DEFINE(SeparateColorNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
SeparateColorNode::SeparateColorNode() : ShaderNode(get_node_type())
|
SeparateColorNode::SeparateColorNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SeparateColorNode::constant_fold(const ConstantFolder &folder)
|
void SeparateColorNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5687,9 +5589,7 @@ NODE_DEFINE(SeparateRGBNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
SeparateRGBNode::SeparateRGBNode() : ShaderNode(get_node_type())
|
SeparateRGBNode::SeparateRGBNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SeparateRGBNode::constant_fold(const ConstantFolder &folder)
|
void SeparateRGBNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5740,9 +5640,7 @@ NODE_DEFINE(SeparateXYZNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
SeparateXYZNode::SeparateXYZNode() : ShaderNode(get_node_type())
|
SeparateXYZNode::SeparateXYZNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SeparateXYZNode::constant_fold(const ConstantFolder &folder)
|
void SeparateXYZNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5793,9 +5691,7 @@ NODE_DEFINE(SeparateHSVNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
SeparateHSVNode::SeparateHSVNode() : ShaderNode(get_node_type())
|
SeparateHSVNode::SeparateHSVNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SeparateHSVNode::constant_fold(const ConstantFolder &folder)
|
void SeparateHSVNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -5847,9 +5743,7 @@ NODE_DEFINE(HSVNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
HSVNode::HSVNode() : ShaderNode(get_node_type())
|
HSVNode::HSVNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void HSVNode::compile(SVMCompiler &compiler)
|
void HSVNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -5890,9 +5784,7 @@ NODE_DEFINE(AttributeNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
AttributeNode::AttributeNode() : ShaderNode(get_node_type())
|
AttributeNode::AttributeNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void AttributeNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void AttributeNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -5978,9 +5870,7 @@ NODE_DEFINE(CameraNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
CameraNode::CameraNode() : ShaderNode(get_node_type())
|
CameraNode::CameraNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CameraNode::compile(SVMCompiler &compiler)
|
void CameraNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -6014,9 +5904,7 @@ NODE_DEFINE(FresnelNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
FresnelNode::FresnelNode() : ShaderNode(get_node_type())
|
FresnelNode::FresnelNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void FresnelNode::compile(SVMCompiler &compiler)
|
void FresnelNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -6052,9 +5940,7 @@ NODE_DEFINE(LayerWeightNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
LayerWeightNode::LayerWeightNode() : ShaderNode(get_node_type())
|
LayerWeightNode::LayerWeightNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void LayerWeightNode::compile(SVMCompiler &compiler)
|
void LayerWeightNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -6100,9 +5986,7 @@ NODE_DEFINE(WireframeNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
WireframeNode::WireframeNode() : ShaderNode(get_node_type())
|
WireframeNode::WireframeNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void WireframeNode::compile(SVMCompiler &compiler)
|
void WireframeNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -6148,9 +6032,7 @@ NODE_DEFINE(WavelengthNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
WavelengthNode::WavelengthNode() : ShaderNode(get_node_type())
|
WavelengthNode::WavelengthNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void WavelengthNode::compile(SVMCompiler &compiler)
|
void WavelengthNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -6178,9 +6060,7 @@ NODE_DEFINE(BlackbodyNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
BlackbodyNode::BlackbodyNode() : ShaderNode(get_node_type())
|
BlackbodyNode::BlackbodyNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BlackbodyNode::constant_fold(const ConstantFolder &folder)
|
void BlackbodyNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -6271,9 +6151,7 @@ NODE_DEFINE(MapRangeNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MapRangeNode::MapRangeNode() : ShaderNode(get_node_type())
|
MapRangeNode::MapRangeNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MapRangeNode::expand(ShaderGraph *graph)
|
void MapRangeNode::expand(ShaderGraph *graph)
|
||||||
{
|
{
|
||||||
@ -6365,13 +6243,9 @@ NODE_DEFINE(VectorMapRangeNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VectorMapRangeNode::VectorMapRangeNode() : ShaderNode(get_node_type())
|
VectorMapRangeNode::VectorMapRangeNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VectorMapRangeNode::expand(ShaderGraph * /*graph*/)
|
void VectorMapRangeNode::expand(ShaderGraph * /*graph*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VectorMapRangeNode::compile(SVMCompiler &compiler)
|
void VectorMapRangeNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -6426,9 +6300,7 @@ NODE_DEFINE(ClampNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
ClampNode::ClampNode() : ShaderNode(get_node_type())
|
ClampNode::ClampNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ClampNode::constant_fold(const ConstantFolder &folder)
|
void ClampNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -6579,9 +6451,7 @@ NODE_DEFINE(MathNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
MathNode::MathNode() : ShaderNode(get_node_type())
|
MathNode::MathNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MathNode::expand(ShaderGraph *graph)
|
void MathNode::expand(ShaderGraph *graph)
|
||||||
{
|
{
|
||||||
@ -6686,9 +6556,7 @@ NODE_DEFINE(VectorMathNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VectorMathNode::VectorMathNode() : ShaderNode(get_node_type())
|
VectorMathNode::VectorMathNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VectorMathNode::constant_fold(const ConstantFolder &folder)
|
void VectorMathNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -6776,9 +6644,7 @@ NODE_DEFINE(VectorRotateNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VectorRotateNode::VectorRotateNode() : ShaderNode(get_node_type())
|
VectorRotateNode::VectorRotateNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VectorRotateNode::compile(SVMCompiler &compiler)
|
void VectorRotateNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -6832,9 +6698,7 @@ NODE_DEFINE(VectorTransformNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VectorTransformNode::VectorTransformNode() : ShaderNode(get_node_type())
|
VectorTransformNode::VectorTransformNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VectorTransformNode::compile(SVMCompiler &compiler)
|
void VectorTransformNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -6936,9 +6800,7 @@ void BumpNode::constant_fold(const ConstantFolder &folder)
|
|||||||
|
|
||||||
/* Curves node */
|
/* Curves node */
|
||||||
|
|
||||||
CurvesNode::CurvesNode(const NodeType *node_type) : ShaderNode(node_type)
|
CurvesNode::CurvesNode(const NodeType *node_type) : ShaderNode(node_type) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CurvesNode::constant_fold(const ConstantFolder &folder, ShaderInput *value_in)
|
void CurvesNode::constant_fold(const ConstantFolder &folder, ShaderInput *value_in)
|
||||||
{
|
{
|
||||||
@ -7030,9 +6892,7 @@ NODE_DEFINE(RGBCurvesNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
RGBCurvesNode::RGBCurvesNode() : CurvesNode(get_node_type())
|
RGBCurvesNode::RGBCurvesNode() : CurvesNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void RGBCurvesNode::constant_fold(const ConstantFolder &folder)
|
void RGBCurvesNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -7068,9 +6928,7 @@ NODE_DEFINE(VectorCurvesNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VectorCurvesNode::VectorCurvesNode() : CurvesNode(get_node_type())
|
VectorCurvesNode::VectorCurvesNode() : CurvesNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VectorCurvesNode::constant_fold(const ConstantFolder &folder)
|
void VectorCurvesNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -7106,9 +6964,7 @@ NODE_DEFINE(FloatCurveNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
FloatCurveNode::FloatCurveNode() : ShaderNode(get_node_type())
|
FloatCurveNode::FloatCurveNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void FloatCurveNode::constant_fold(const ConstantFolder &folder)
|
void FloatCurveNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -7185,9 +7041,7 @@ NODE_DEFINE(RGBRampNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
RGBRampNode::RGBRampNode() : ShaderNode(get_node_type())
|
RGBRampNode::RGBRampNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void RGBRampNode::constant_fold(const ConstantFolder &folder)
|
void RGBRampNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -7258,9 +7112,7 @@ NODE_DEFINE(SetNormalNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetNormalNode::SetNormalNode() : ShaderNode(get_node_type())
|
SetNormalNode::SetNormalNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetNormalNode::compile(SVMCompiler &compiler)
|
void SetNormalNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -7379,9 +7231,7 @@ NODE_DEFINE(NormalMapNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
NormalMapNode::NormalMapNode() : ShaderNode(get_node_type())
|
NormalMapNode::NormalMapNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void NormalMapNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void NormalMapNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -7469,9 +7319,7 @@ NODE_DEFINE(TangentNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
TangentNode::TangentNode() : ShaderNode(get_node_type())
|
TangentNode::TangentNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void TangentNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
void TangentNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||||
{
|
{
|
||||||
@ -7539,9 +7387,7 @@ NODE_DEFINE(BevelNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
BevelNode::BevelNode() : ShaderNode(get_node_type())
|
BevelNode::BevelNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BevelNode::compile(SVMCompiler &compiler)
|
void BevelNode::compile(SVMCompiler &compiler)
|
||||||
{
|
{
|
||||||
@ -7584,9 +7430,7 @@ NODE_DEFINE(DisplacementNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
DisplacementNode::DisplacementNode() : ShaderNode(get_node_type())
|
DisplacementNode::DisplacementNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void DisplacementNode::constant_fold(const ConstantFolder &folder)
|
void DisplacementNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
@ -7643,9 +7487,7 @@ NODE_DEFINE(VectorDisplacementNode)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
VectorDisplacementNode::VectorDisplacementNode() : ShaderNode(get_node_type())
|
VectorDisplacementNode::VectorDisplacementNode() : ShaderNode(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void VectorDisplacementNode::constant_fold(const ConstantFolder &folder)
|
void VectorDisplacementNode::constant_fold(const ConstantFolder &folder)
|
||||||
{
|
{
|
||||||
|
@ -53,9 +53,7 @@ class TextureMapping {
|
|||||||
|
|
||||||
class TextureNode : public ShaderNode {
|
class TextureNode : public ShaderNode {
|
||||||
public:
|
public:
|
||||||
explicit TextureNode(const NodeType *node_type) : ShaderNode(node_type)
|
explicit TextureNode(const NodeType *node_type) : ShaderNode(node_type) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
TextureMapping tex_mapping;
|
TextureMapping tex_mapping;
|
||||||
NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, translation)
|
NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, translation)
|
||||||
NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, rotation)
|
NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, rotation)
|
||||||
|
@ -40,27 +40,17 @@ bool namedSampleCountPairComparator(const NamedSampleCountPair &a, const NamedSa
|
|||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
NamedSizeEntry::NamedSizeEntry() : name(""), size(0)
|
NamedSizeEntry::NamedSizeEntry() : name(""), size(0) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
NamedSizeEntry::NamedSizeEntry(const string &name, size_t size) : name(name), size(size)
|
NamedSizeEntry::NamedSizeEntry(const string &name, size_t size) : name(name), size(size) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
NamedTimeEntry::NamedTimeEntry() : name(""), time(0)
|
NamedTimeEntry::NamedTimeEntry() : name(""), time(0) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
NamedTimeEntry::NamedTimeEntry(const string &name, double time) : name(name), time(time)
|
NamedTimeEntry::NamedTimeEntry(const string &name, double time) : name(name), time(time) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Named size statistics. */
|
/* Named size statistics. */
|
||||||
|
|
||||||
NamedSizeStats::NamedSizeStats() : total_size(0)
|
NamedSizeStats::NamedSizeStats() : total_size(0) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void NamedSizeStats::add_entry(const NamedSizeEntry &entry)
|
void NamedSizeStats::add_entry(const NamedSizeEntry &entry)
|
||||||
{
|
{
|
||||||
@ -104,9 +94,7 @@ string NamedTimeStats::full_report(int indent_level)
|
|||||||
|
|
||||||
/* Named time sample statistics. */
|
/* Named time sample statistics. */
|
||||||
|
|
||||||
NamedNestedSampleStats::NamedNestedSampleStats() : name(""), self_samples(0), sum_samples(0)
|
NamedNestedSampleStats::NamedNestedSampleStats() : name(""), self_samples(0), sum_samples(0) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
NamedNestedSampleStats::NamedNestedSampleStats(const string &name, uint64_t samples)
|
NamedNestedSampleStats::NamedNestedSampleStats(const string &name, uint64_t samples)
|
||||||
: name(name), self_samples(samples), sum_samples(samples)
|
: name(name), self_samples(samples), sum_samples(samples)
|
||||||
@ -164,9 +152,7 @@ NamedSampleCountPair::NamedSampleCountPair(const ustring &name, uint64_t samples
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
NamedSampleCountStats::NamedSampleCountStats()
|
NamedSampleCountStats::NamedSampleCountStats() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void NamedSampleCountStats::add(const ustring &name, uint64_t samples, uint64_t hits)
|
void NamedSampleCountStats::add(const ustring &name, uint64_t samples, uint64_t hits)
|
||||||
{
|
{
|
||||||
@ -213,9 +199,7 @@ string NamedSampleCountStats::full_report(int indent_level)
|
|||||||
|
|
||||||
/* Mesh statistics. */
|
/* Mesh statistics. */
|
||||||
|
|
||||||
MeshStats::MeshStats()
|
MeshStats::MeshStats() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
string MeshStats::full_report(int indent_level)
|
string MeshStats::full_report(int indent_level)
|
||||||
{
|
{
|
||||||
@ -227,9 +211,7 @@ string MeshStats::full_report(int indent_level)
|
|||||||
|
|
||||||
/* Image statistics. */
|
/* Image statistics. */
|
||||||
|
|
||||||
ImageStats::ImageStats()
|
ImageStats::ImageStats() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
string ImageStats::full_report(int indent_level)
|
string ImageStats::full_report(int indent_level)
|
||||||
{
|
{
|
||||||
@ -313,18 +295,14 @@ string RenderStats::full_report()
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
NamedTimeStats::NamedTimeStats() : total_time(0.0)
|
NamedTimeStats::NamedTimeStats() : total_time(0.0) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
string UpdateTimeStats::full_report(int indent_level)
|
string UpdateTimeStats::full_report(int indent_level)
|
||||||
{
|
{
|
||||||
return times.full_report(indent_level + 1);
|
return times.full_report(indent_level + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
SceneUpdateStats::SceneUpdateStats()
|
SceneUpdateStats::SceneUpdateStats() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
string SceneUpdateStats::full_report()
|
string SceneUpdateStats::full_report()
|
||||||
{
|
{
|
||||||
|
@ -22,17 +22,11 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
/* Shader Manager */
|
/* Shader Manager */
|
||||||
|
|
||||||
SVMShaderManager::SVMShaderManager()
|
SVMShaderManager::SVMShaderManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
SVMShaderManager::~SVMShaderManager()
|
SVMShaderManager::~SVMShaderManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SVMShaderManager::reset(Scene * /*scene*/)
|
void SVMShaderManager::reset(Scene * /*scene*/) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SVMShaderManager::device_update_shader(Scene *scene,
|
void SVMShaderManager::device_update_shader(Scene *scene,
|
||||||
Shader *shader,
|
Shader *shader,
|
||||||
|
@ -56,9 +56,7 @@ NODE_DEFINE(BufferPass)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
BufferPass::BufferPass() : Node(get_node_type())
|
BufferPass::BufferPass() : Node(get_node_type()) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
BufferPass::BufferPass(const Pass *scene_pass)
|
BufferPass::BufferPass(const Pass *scene_pass)
|
||||||
: Node(get_node_type()),
|
: Node(get_node_type()),
|
||||||
@ -262,9 +260,7 @@ bool BufferParams::modified(const BufferParams &other) const
|
|||||||
* Render Buffers.
|
* Render Buffers.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
RenderBuffers::RenderBuffers(Device *device) : buffer(device, "RenderBuffers", MEM_READ_WRITE)
|
RenderBuffers::RenderBuffers(Device *device) : buffer(device, "RenderBuffers", MEM_READ_WRITE) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
RenderBuffers::~RenderBuffers()
|
RenderBuffers::~RenderBuffers()
|
||||||
{
|
{
|
||||||
|
@ -563,9 +563,7 @@ static void read_layer_samples(vector<MergeImage> &images,
|
|||||||
}
|
}
|
||||||
/* Image Merger */
|
/* Image Merger */
|
||||||
|
|
||||||
ImageMerger::ImageMerger()
|
ImageMerger::ImageMerger() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ImageMerger::run()
|
bool ImageMerger::run()
|
||||||
{
|
{
|
||||||
|
@ -319,9 +319,7 @@ TileManager::TileManager()
|
|||||||
to_string(tile_manager_id);
|
to_string(tile_manager_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
TileManager::~TileManager()
|
TileManager::~TileManager() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int TileManager::compute_render_tile_size(const int suggested_tile_size) const
|
int TileManager::compute_render_tile_size(const int suggested_tile_size) const
|
||||||
{
|
{
|
||||||
|
@ -25,9 +25,7 @@ class Tile {
|
|||||||
int window_x = 0, window_y = 0;
|
int window_x = 0, window_y = 0;
|
||||||
int window_width = 0, window_height = 0;
|
int window_width = 0, window_height = 0;
|
||||||
|
|
||||||
Tile()
|
Tile() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* --------------------------------------------------------------------
|
/* --------------------------------------------------------------------
|
||||||
|
@ -115,9 +115,7 @@ void EdgeDice::stitch_triangles(Subpatch &sub, int edge)
|
|||||||
|
|
||||||
/* QuadDice */
|
/* QuadDice */
|
||||||
|
|
||||||
QuadDice::QuadDice(const SubdParams ¶ms_) : EdgeDice(params_)
|
QuadDice::QuadDice(const SubdParams ¶ms_) : EdgeDice(params_) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
float2 QuadDice::map_uv(Subpatch &sub, float u, float v)
|
float2 QuadDice::map_uv(Subpatch &sub, float u, float v)
|
||||||
{
|
{
|
||||||
|
@ -11,9 +11,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
class Patch {
|
class Patch {
|
||||||
public:
|
public:
|
||||||
Patch() : patch_index(0), shader(0), from_ngon(false)
|
Patch() : patch_index(0), shader(0), from_ngon(false) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ~Patch() = default;
|
virtual ~Patch() = default;
|
||||||
|
|
||||||
|
@ -22,9 +22,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
#define STITCH_NGON_CENTER_VERT_INDEX_OFFSET 0x60000000
|
#define STITCH_NGON_CENTER_VERT_INDEX_OFFSET 0x60000000
|
||||||
#define STITCH_NGON_SPLIT_EDGE_CENTER_VERT_TAG (0x60000000 - 1)
|
#define STITCH_NGON_SPLIT_EDGE_CENTER_VERT_TAG (0x60000000 - 1)
|
||||||
|
|
||||||
DiagSplit::DiagSplit(const SubdParams ¶ms_) : params(params_)
|
DiagSplit::DiagSplit(const SubdParams ¶ms_) : params(params_) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
float3 DiagSplit::to_world(Patch *patch, float2 uv)
|
float3 DiagSplit::to_world(Patch *patch, float2 uv)
|
||||||
{
|
{
|
||||||
|
@ -160,9 +160,7 @@ class RenderGraph : public testing::Test {
|
|||||||
ShaderGraph graph;
|
ShaderGraph graph;
|
||||||
ShaderGraphBuilder builder;
|
ShaderGraphBuilder builder;
|
||||||
|
|
||||||
RenderGraph() : testing::Test(), builder(&graph)
|
RenderGraph() : testing::Test(), builder(&graph) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void SetUp()
|
virtual void SetUp()
|
||||||
{
|
{
|
||||||
|
@ -9,9 +9,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
void task_run()
|
void task_run() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
@ -23,9 +23,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
template<typename T, size_t alignment = MIN_ALIGNMENT_CPU_DATA_TYPES> class array {
|
template<typename T, size_t alignment = MIN_ALIGNMENT_CPU_DATA_TYPES> class array {
|
||||||
public:
|
public:
|
||||||
array() : data_(NULL), datasize_(0), capacity_(0)
|
array() : data_(NULL), datasize_(0), capacity_(0) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
explicit array(size_t newsize)
|
explicit array(size_t newsize)
|
||||||
{
|
{
|
||||||
|
@ -20,17 +20,11 @@ class BoundBox {
|
|||||||
public:
|
public:
|
||||||
float3 min, max;
|
float3 min, max;
|
||||||
|
|
||||||
__forceinline BoundBox()
|
__forceinline BoundBox() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
__forceinline BoundBox(const float3 &pt) : min(pt), max(pt)
|
__forceinline BoundBox(const float3 &pt) : min(pt), max(pt) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
__forceinline BoundBox(const float3 &min_, const float3 &max_) : min(min_), max(max_)
|
__forceinline BoundBox(const float3 &min_, const float3 &max_) : min(min_), max(max_) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
enum empty_t { empty = 0 };
|
enum empty_t { empty = 0 };
|
||||||
|
|
||||||
@ -199,9 +193,7 @@ class BoundBox2D {
|
|||||||
float bottom;
|
float bottom;
|
||||||
float top;
|
float top;
|
||||||
|
|
||||||
BoundBox2D() : left(0.0f), right(1.0f), bottom(0.0f), top(1.0f)
|
BoundBox2D() : left(0.0f), right(1.0f), bottom(0.0f), top(1.0f) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator==(const BoundBox2D &other) const
|
bool operator==(const BoundBox2D &other) const
|
||||||
{
|
{
|
||||||
|
@ -29,12 +29,8 @@ template<typename T> class GuardedAllocator {
|
|||||||
typedef const T &const_reference;
|
typedef const T &const_reference;
|
||||||
typedef T value_type;
|
typedef T value_type;
|
||||||
|
|
||||||
GuardedAllocator()
|
GuardedAllocator() {}
|
||||||
{
|
GuardedAllocator(const GuardedAllocator &) {}
|
||||||
}
|
|
||||||
GuardedAllocator(const GuardedAllocator &)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
T *allocate(size_t n, const void *hint = 0)
|
T *allocate(size_t n, const void *hint = 0)
|
||||||
{
|
{
|
||||||
@ -97,9 +93,7 @@ template<typename T> class GuardedAllocator {
|
|||||||
typedef GuardedAllocator<U> other;
|
typedef GuardedAllocator<U> other;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<class U> GuardedAllocator(const GuardedAllocator<U> &)
|
template<class U> GuardedAllocator(const GuardedAllocator<U> &) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
template<class U> GuardedAllocator &operator=(const GuardedAllocator<U> &)
|
template<class U> GuardedAllocator &operator=(const GuardedAllocator<U> &)
|
||||||
{
|
{
|
||||||
|
@ -40,12 +40,8 @@ ccl_device_inline float half_to_float(half h_in)
|
|||||||
* unsigned shorts. */
|
* unsigned shorts. */
|
||||||
class half {
|
class half {
|
||||||
public:
|
public:
|
||||||
half() : v(0)
|
half() : v(0) {}
|
||||||
{
|
half(const unsigned short &i) : v(i) {}
|
||||||
}
|
|
||||||
half(const unsigned short &i) : v(i)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
operator unsigned short()
|
operator unsigned short()
|
||||||
{
|
{
|
||||||
return v;
|
return v;
|
||||||
|
@ -11,9 +11,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
class IESFile {
|
class IESFile {
|
||||||
public:
|
public:
|
||||||
IESFile()
|
IESFile() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
~IESFile();
|
~IESFile();
|
||||||
|
|
||||||
int packed_size();
|
int packed_size();
|
||||||
|
@ -24,12 +24,8 @@ class StubStream {
|
|||||||
|
|
||||||
class LogMessageVoidify {
|
class LogMessageVoidify {
|
||||||
public:
|
public:
|
||||||
LogMessageVoidify()
|
LogMessageVoidify() {}
|
||||||
{
|
void operator&(const StubStream &) {}
|
||||||
}
|
|
||||||
void operator&(const StubStream &)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# define LOG_SUPPRESS() (true) ? ((void)0) : LogMessageVoidify() & StubStream()
|
# define LOG_SUPPRESS() (true) ? ((void)0) : LogMessageVoidify() & StubStream()
|
||||||
|
@ -249,9 +249,7 @@ MD5Hash::MD5Hash()
|
|||||||
abcd[3] = 0x10325476;
|
abcd[3] = 0x10325476;
|
||||||
}
|
}
|
||||||
|
|
||||||
MD5Hash::~MD5Hash()
|
MD5Hash::~MD5Hash() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void MD5Hash::append(const uint8_t *data, int nbytes)
|
void MD5Hash::append(const uint8_t *data, int nbytes)
|
||||||
{
|
{
|
||||||
|
@ -80,9 +80,7 @@ class directory_iterator {
|
|||||||
const WIN32_FIND_DATAW &find_data_;
|
const WIN32_FIND_DATAW &find_data_;
|
||||||
};
|
};
|
||||||
|
|
||||||
directory_iterator() : path_info_("", find_data_), h_find_(INVALID_HANDLE_VALUE)
|
directory_iterator() : path_info_("", find_data_), h_find_(INVALID_HANDLE_VALUE) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
explicit directory_iterator(const string &path) : path_(path), path_info_(path, find_data_)
|
explicit directory_iterator(const string &path) : path_(path), path_info_(path, find_data_)
|
||||||
{
|
{
|
||||||
@ -163,9 +161,7 @@ class directory_iterator {
|
|||||||
public:
|
public:
|
||||||
class path_info {
|
class path_info {
|
||||||
public:
|
public:
|
||||||
explicit path_info(const string &path) : path_(path), entry_(NULL)
|
explicit path_info(const string &path) : path_(path), entry_(NULL) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
string path()
|
string path()
|
||||||
{
|
{
|
||||||
@ -182,9 +178,7 @@ class directory_iterator {
|
|||||||
const struct dirent *entry_;
|
const struct dirent *entry_;
|
||||||
};
|
};
|
||||||
|
|
||||||
directory_iterator() : path_info_(""), name_list_(NULL), num_entries_(-1), cur_entry_(-1)
|
directory_iterator() : path_info_(""), name_list_(NULL), num_entries_(-1), cur_entry_(-1) {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
explicit directory_iterator(const string &path) : path_(path), path_info_(path_), cur_entry_(0)
|
explicit directory_iterator(const string &path) : path_(path), path_info_(path_), cur_entry_(0)
|
||||||
{
|
{
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user