blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 746 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +2723 -4424
680 changed files with 2723 additions and 4424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 73c9a8397a - Show all commits

2
.clang-format
View File

@ -130,7 +130,7 @@ PenaltyReturnTypeOnItsOwnLine: 10000
#
PenaltyBreakAssignment: 100
AllowShortFunctionsOnASingleLine: None
AllowShortFunctionsOnASingleLine: Empty
SortIncludes: true

69
build_files/cmake/macros.cmake
View File

@ -1300,16 +1300,29 @@ macro(windows_install_shared_manifest)
endif()
if(WINDOWS_INSTALL_DEBUG)
set(WINDOWS_CONFIGURATIONS "${WINDOWS_CONFIGURATIONS};Debug")
list(APPEND WINDOWS_SHARED_MANIFEST_DEBUG ${WINDOWS_INSTALL_FILES})
endif()
if(WINDOWS_INSTALL_RELEASE)
list(APPEND WINDOWS_SHARED_MANIFEST_RELEASE ${WINDOWS_INSTALL_FILES})
set(WINDOWS_CONFIGURATIONS "${WINDOWS_CONFIGURATIONS};Release;RelWithDebInfo;MinSizeRel")
endif()
install(FILES ${WINDOWS_INSTALL_FILES}
CONFIGURATIONS ${WINDOWS_CONFIGURATIONS}
DESTINATION "./blender.shared"
)
if(NOT WITH_PYTHON_MODULE)
# Blender executable with manifest.
if(WINDOWS_INSTALL_DEBUG)
list(APPEND WINDOWS_SHARED_MANIFEST_DEBUG ${WINDOWS_INSTALL_FILES})
endif()
if(WINDOWS_INSTALL_RELEASE)
list(APPEND WINDOWS_SHARED_MANIFEST_RELEASE ${WINDOWS_INSTALL_FILES})
endif()
install(FILES ${WINDOWS_INSTALL_FILES}
CONFIGURATIONS ${WINDOWS_CONFIGURATIONS}
DESTINATION "./blender.shared"
)
else()
# Python module without manifest.
install(FILES ${WINDOWS_INSTALL_FILES}
CONFIGURATIONS ${WINDOWS_CONFIGURATIONS}
DESTINATION "./bpy"
)
endif()
endmacro()
macro(windows_generate_manifest)
@ -1326,24 +1339,28 @@ macro(windows_generate_manifest)
endmacro()
macro(windows_generate_shared_manifest)
windows_generate_manifest(
FILES "${WINDOWS_SHARED_MANIFEST_DEBUG}"
OUTPUT "${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest"
NAME "blender.shared"
)
windows_generate_manifest(
FILES "${WINDOWS_SHARED_MANIFEST_RELEASE}"
OUTPUT "${CMAKE_BINARY_DIR}/Release/blender.shared.manifest"
NAME "blender.shared"
)
install(
FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest
DESTINATION "./blender.shared"
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
install(
FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest
DESTINATION "./blender.shared"
CONFIGURATIONS Debug
)
if(WINDOWS_SHARED_MANIFEST_DEBUG)
windows_generate_manifest(
FILES "${WINDOWS_SHARED_MANIFEST_DEBUG}"
OUTPUT "${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest"
NAME "blender.shared"
)
install(
FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest
DESTINATION "./blender.shared"
CONFIGURATIONS Debug
)
endif()
if(WINDOWS_SHARED_MANIFEST_RELEASE)
windows_generate_manifest(
FILES "${WINDOWS_SHARED_MANIFEST_RELEASE}"
OUTPUT "${CMAKE_BINARY_DIR}/Release/blender.shared.manifest"
NAME "blender.shared"
)
install(
FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest
DESTINATION "./blender.shared"
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
endif()
endmacro()

15
build_files/cmake/platform/platform_win32.cmake
View File

@ -114,12 +114,13 @@ add_definitions(-D_WIN32_WINNT=0x603)
# First generate the manifest for tests since it will not need the dependency on the CRT.
configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/tests.exe.manifest @ONLY)
if(WITH_WINDOWS_BUNDLE_CRT)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP})
include(InstallRequiredSystemLibraries)
# Always detect CRT paths, but only manually install with WITH_WINDOWS_BUNDLE_CRT.
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP})
include(InstallRequiredSystemLibraries)
if(WITH_WINDOWS_BUNDLE_CRT)
# ucrtbase(d).dll cannot be in the manifest, due to the way windows 10 handles
# redirects for this dll, for details see #88813.
foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
@ -141,7 +142,9 @@ if(WITH_WINDOWS_BUNDLE_CRT)
install(FILES ${CMAKE_BINARY_DIR}/blender.crt.manifest DESTINATION ./blender.crt)
set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
endif()
set(BUNDLECRT "${BUNDLECRT}<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.shared\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
if(NOT WITH_PYTHON_MODULE)
set(BUNDLECRT "${BUNDLECRT}<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.shared\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
endif()
configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY)

19
extern/quadriflow/patches/blender.patch vendored
View File

@ -231,3 +231,22 @@ index 355ee008246..a770bbee60c 100644
}
allocator.deallocate(values, capacity);
capacity = 0;
diff --git a/extern/quadriflow/src/hierarchy.cpp b/extern/quadriflow/src/hierarchy.cpp
index 8cc41da23d0..70a9628320f 100644
--- a/extern/quadriflow/src/hierarchy.cpp
+++ b/extern/quadriflow/src/hierarchy.cpp
@@ -269,7 +269,13 @@ void Hierarchy::DownsampleGraph(const AdjacentMatrix adj, const MatrixXd& V, con
for (auto it = ad.begin(); it != ad.end(); ++it, ++entry_it) {
int k = it->id;
double dp = N.col(i).dot(N.col(k));
- double ratio = A[i] > A[k] ? (A[i] / A[k]) : (A[k] / A[i]);
+ double ratio;
+ if (A[i] > A[k]) {
+ ratio = (A[k] == 0.0f) ? 1.0f : A[i] / A[k];
+ }
+ else {
+ ratio = (A[i] == 0.0f) ? 1.0f : A[k] / A[i];
+ }
*entry_it = Entry(i, k, dp * ratio);
}
}

8
extern/quadriflow/src/hierarchy.cpp vendored
View File

@ -269,7 +269,13 @@ void Hierarchy::DownsampleGraph(const AdjacentMatrix adj, const MatrixXd& V, con
for (auto it = ad.begin(); it != ad.end(); ++it, ++entry_it) {
int k = it->id;
double dp = N.col(i).dot(N.col(k));
double ratio = A[i] > A[k] ? (A[i] / A[k]) : (A[k] / A[i]);
double ratio;
if (A[i] > A[k]) {
ratio = (A[k] == 0.0f) ? 1.0f : A[i] / A[k];
}
else {
ratio = (A[i] == 0.0f) ? 1.0f : A[k] / A[i];
}
*entry_it = Entry(i, k, dp * ratio);
}
}

4
intern/cycles/app/oiio_output_driver.cpp
View File

@ -17,9 +17,7 @@ OIIOOutputDriver::OIIOOutputDriver(const string_view filepath,
{
}
OIIOOutputDriver::~OIIOOutputDriver()
{
}
OIIOOutputDriver::~OIIOOutputDriver() {}
void OIIOOutputDriver::write_render_tile(const Tile &tile)
{

4
intern/cycles/app/opengl/display_driver.cpp
View File

@ -22,9 +22,7 @@ OpenGLDisplayDriver::OpenGLDisplayDriver(const function<bool()> &gl_context_enab
{
}
OpenGLDisplayDriver::~OpenGLDisplayDriver()
{
}
OpenGLDisplayDriver::~OpenGLDisplayDriver() {}
/* --------------------------------------------------------------------
* Update procedure.

4
intern/cycles/app/opengl/shader.cpp
View File

@ -149,9 +149,7 @@ void OpenGLShader::bind(int width, int height)
glUniform2f(fullscreen_location_, width, height);
}
void OpenGLShader::unbind()
{
}
void OpenGLShader::unbind() {}
uint OpenGLShader::get_shader_program()
{

8
intern/cycles/blender/curves.cpp
View File

@ -20,13 +20,9 @@
CCL_NAMESPACE_BEGIN
ParticleCurveData::ParticleCurveData()
{
}
ParticleCurveData::ParticleCurveData() {}
ParticleCurveData::~ParticleCurveData()
{
}
ParticleCurveData::~ParticleCurveData() {}
static float shaperadius(float shape, float root, float tip, float time)
{

8
intern/cycles/blender/id_map.h
View File

@ -22,9 +22,7 @@ CCL_NAMESPACE_BEGIN
template<typename K, typename T, typename Flags = uint> class id_map {
public:
id_map(Scene *scene_) : scene(scene_)
{
}
id_map(Scene *scene_) : scene(scene_) {}
~id_map()
{
@ -262,9 +260,7 @@ struct GeometryKey {
void *id;
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
{

4
intern/cycles/blender/mesh.cpp
View File

@ -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. */
class VertexAverageComparator {
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)
{

8
intern/cycles/blender/output_driver.cpp
View File

@ -5,13 +5,9 @@
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)
{

4
intern/cycles/blender/sync.cpp
View File

@ -67,9 +67,7 @@ BlenderSync::BlenderSync(BL::RenderEngine &b_engine,
max_subdivisions = RNA_int_get(&cscene, "max_subdivisions");
}
BlenderSync::~BlenderSync()
{
}
BlenderSync::~BlenderSync() {}
void BlenderSync::reset(BL::BlendData &b_data, BL::Scene &b_scene)
{

4
intern/cycles/blender/util.h
View File

@ -702,9 +702,7 @@ static inline bool object_need_motion_attribute(BObjectInfo &b_ob_info, Scene *s
class EdgeMap {
public:
EdgeMap()
{
}
EdgeMap() {}
void clear()
{

16
intern/cycles/bvh/binning.cpp
View File

@ -16,18 +16,10 @@ CCL_NAMESPACE_BEGIN
/* SSE replacements */
__forceinline void prefetch_L1(const void * /*ptr*/)
{
}
__forceinline void prefetch_L2(const void * /*ptr*/)
{
}
__forceinline void prefetch_L3(const void * /*ptr*/)
{
}
__forceinline void prefetch_NTA(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_NTA(const void * /*ptr*/) {}
template<size_t src> __forceinline float extract(const int4 &b)
{

4
intern/cycles/bvh/binning.h
View File

@ -23,9 +23,7 @@ class BVHBuild;
class BVHObjectBinning : public BVHRange {
public:
__forceinline BVHObjectBinning() : leafSAH(FLT_MAX)
{
}
__forceinline BVHObjectBinning() : leafSAH(FLT_MAX) {}
BVHObjectBinning(const BVHRange &job,
BVHReference *prims,

4
intern/cycles/bvh/build.cpp
View File

@ -49,9 +49,7 @@ BVHBuild::BVHBuild(const vector<Object *> &objects_,
spatial_min_overlap = 0.0f;
}
BVHBuild::~BVHBuild()
{
}
BVHBuild::~BVHBuild() {}
/* Adding References */

4
intern/cycles/bvh/bvh.h
View File

@ -70,9 +70,7 @@ class BVH {
const vector<Geometry *> &geometry,
const vector<Object *> &objects,
Device *device);
virtual ~BVH()
{
}
virtual ~BVH() {}
virtual void replace_geometry(const vector<Geometry *> &geometry,
const vector<Object *> &objects)

4
intern/cycles/bvh/bvh2.cpp
View File

@ -18,9 +18,7 @@
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
{

4
intern/cycles/bvh/node.h
View File

@ -211,9 +211,7 @@ class LeafNode : public BVHNode {
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
{

8
intern/cycles/bvh/params.h
View File

@ -183,9 +183,7 @@ class BVHParams {
class BVHReference {
public:
__forceinline BVHReference()
{
}
__forceinline BVHReference() {}
__forceinline BVHReference(const BoundBox &bounds_,
int prim_index_,
@ -307,9 +305,7 @@ struct BVHSpatialBin {
int enter;
int exit;
__forceinline BVHSpatialBin()
{
}
__forceinline BVHSpatialBin() {}
};
/* BVH Spatial Storage

12
intern/cycles/bvh/split.h
View File

@ -26,9 +26,7 @@ class BVHObjectSplit {
BoundBox left_bounds;
BoundBox right_bounds;
BVHObjectSplit()
{
}
BVHObjectSplit() {}
BVHObjectSplit(BVHBuild *builder,
BVHSpatialStorage *storage,
const BVHRange &range,
@ -64,9 +62,7 @@ class BVHSpatialSplit {
int dim;
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,
BVHSpatialStorage *storage,
const BVHRange &range,
@ -181,9 +177,7 @@ class BVHMixedSplit {
BoundBox bounds;
BVHMixedSplit()
{
}
BVHMixedSplit() {}
__forceinline BVHMixedSplit(BVHBuild *builder,
BVHSpatialStorage *storage,

4
intern/cycles/bvh/unaligned.cpp
View File

@ -14,9 +14,7 @@
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,
const BVHReference *references) const

4
intern/cycles/device/cpu/kernel_function.h
View File

@ -40,9 +40,7 @@ template<typename FunctionType> class CPUKernelFunction {
* pointer. */
class KernelInfo {
public:
KernelInfo() : KernelInfo("", nullptr)
{
}
KernelInfo() : KernelInfo("", nullptr) {}
/* TODO(sergey): Use string view, to have higher-level functionality (i.e. comparison) without
* memory allocation. */

4
intern/cycles/device/denoise.cpp
View File

@ -70,8 +70,6 @@ NODE_DEFINE(DenoiseParams)
return type;
}
DenoiseParams::DenoiseParams() : Node(get_node_type())
{
}
DenoiseParams::DenoiseParams() : Node(get_node_type()) {}
CCL_NAMESPACE_END

8
intern/cycles/device/device.cpp
View File

@ -45,9 +45,7 @@ uint Device::devices_initialized_mask = 0;
/* Device */
Device::~Device() noexcept(false)
{
}
Device::~Device() noexcept(false) {}
void Device::build_bvh(BVH *bvh, Progress &progress, bool refit)
{
@ -452,9 +450,7 @@ void *Device::get_cpu_osl_memory()
return nullptr;
}
GPUDevice::~GPUDevice() noexcept(false)
{
}
GPUDevice::~GPUDevice() noexcept(false) {}
bool GPUDevice::load_texture_info()
{

12
intern/cycles/device/device.h
View File

@ -178,9 +178,7 @@ class Device {
}
/* Request cancellation of any long-running work. */
virtual void cancel()
{
}
virtual void cancel() {}
/* Report status and return true if device is ready for rendering. */
virtual bool is_ready(string & /*status*/) const
@ -218,9 +216,7 @@ class Device {
}
/* 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)
{
@ -350,9 +346,7 @@ class GPUDevice : public Device {
typedef unsigned long long texMemObject;
typedef unsigned long long arrayMemObject;
struct Mem {
Mem() : texobject(0), array(0), use_mapped_host(false)
{
}
Mem() : texobject(0), array(0), use_mapped_host(false) {}
texMemObject texobject;
arrayMemObject array;

28
intern/cycles/device/dummy/device.cpp
View File

@ -18,38 +18,24 @@ class DummyDevice : public Device {
error_msg = info.error_msg;
}
~DummyDevice()
{
}
~DummyDevice() {}
virtual BVHLayoutMask get_bvh_layout_mask() const override
{
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)

4
intern/cycles/device/memory.h
View File

@ -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));
}
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()
{

4
intern/cycles/device/metal/device.mm
View File

@ -93,9 +93,7 @@ bool device_metal_init()
return false;
}
void device_metal_info(vector<DeviceInfo> &devices)
{
}
void device_metal_info(vector<DeviceInfo> &devices) {}
string device_metal_capabilities()
{

4
intern/cycles/device/optix/queue.cpp
View File

@ -15,9 +15,7 @@ CCL_NAMESPACE_BEGIN
/* CUDADeviceQueue */
OptiXDeviceQueue::OptiXDeviceQueue(OptiXDevice *device) : CUDADeviceQueue(device)
{
}
OptiXDeviceQueue::OptiXDeviceQueue(OptiXDevice *device) : CUDADeviceQueue(device) {}
void OptiXDeviceQueue::init_execution()
{

4
intern/cycles/device/queue.h
View File

@ -36,9 +36,7 @@ struct DeviceKernelArguments {
size_t sizes[MAX_ARGS];
size_t count = 0;
DeviceKernelArguments()
{
}
DeviceKernelArguments() {}
template<class T> DeviceKernelArguments(const T *arg)
{

8
intern/cycles/graph/node.cpp
View File

@ -13,9 +13,7 @@ CCL_NAMESPACE_BEGIN
/* Node Type */
NodeOwner::~NodeOwner()
{
}
NodeOwner::~NodeOwner() {}
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
static bool is_socket_float3(const SocketType &socket)

4
intern/cycles/graph/node_type.cpp
View File

@ -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,
ustring ui_name,

4
intern/cycles/hydra/camera.cpp
View File

@ -51,9 +51,7 @@ HdCyclesCamera::HdCyclesCamera(const SdfPath &sprimId) : HdCamera(sprimId)
#endif
}
HdCyclesCamera::~HdCyclesCamera()
{
}
HdCyclesCamera::~HdCyclesCamera() {}
HdDirtyBits HdCyclesCamera::GetInitialDirtyBitsMask() const
{

4
intern/cycles/hydra/curves.cpp
View File

@ -25,9 +25,7 @@ HdCyclesCurves::HdCyclesCurves(const SdfPath &rprimId
{
}
HdCyclesCurves::~HdCyclesCurves()
{
}
HdCyclesCurves::~HdCyclesCurves() {}
HdDirtyBits HdCyclesCurves::GetInitialDirtyBitsMask() const
{

4
intern/cycles/hydra/display_driver.cpp
View File

@ -112,9 +112,7 @@ void HdCyclesDisplayDriver::gl_context_dispose()
#endif
}
void HdCyclesDisplayDriver::next_tile_begin()
{
}
void HdCyclesDisplayDriver::next_tile_begin() {}
bool HdCyclesDisplayDriver::update_begin(const Params &params,
int texture_width,

8
intern/cycles/hydra/field.cpp
View File

@ -37,13 +37,9 @@ class HdCyclesVolumeLoader : public VDBImageLoader {
};
#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
{

12
intern/cycles/hydra/file_reader.cpp
View File

@ -32,17 +32,11 @@ class DummyHdTask : public HdTask {
}
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
{

4
intern/cycles/hydra/instancer.cpp
View File

@ -26,9 +26,7 @@ HdCyclesInstancer::HdCyclesInstancer(HdSceneDelegate *delegate,
{
}
HdCyclesInstancer::~HdCyclesInstancer()
{
}
HdCyclesInstancer::~HdCyclesInstancer() {}
#if PXR_VERSION > 2011
void HdCyclesInstancer::Sync(HdSceneDelegate *sceneDelegate,

4
intern/cycles/hydra/light.cpp
View File

@ -29,9 +29,7 @@ HdCyclesLight::HdCyclesLight(const SdfPath &sprimId, const TfToken &lightType)
{
}
HdCyclesLight::~HdCyclesLight()
{
}
HdCyclesLight::~HdCyclesLight() {}
HdDirtyBits HdCyclesLight::GetInitialDirtyBitsMask() const
{

8
intern/cycles/hydra/material.cpp
View File

@ -183,13 +183,9 @@ TfStaticData<UsdToCycles> sUsdToCyles;
} // namespace
HdCyclesMaterial::HdCyclesMaterial(const SdfPath &sprimId) : HdMaterial(sprimId)
{
}
HdCyclesMaterial::HdCyclesMaterial(const SdfPath &sprimId) : HdMaterial(sprimId) {}
HdCyclesMaterial::~HdCyclesMaterial()
{
}
HdCyclesMaterial::~HdCyclesMaterial() {}
HdDirtyBits HdCyclesMaterial::GetInitialDirtyBitsMask() const
{

4
intern/cycles/hydra/material.h
View File

@ -22,9 +22,7 @@ class HdCyclesMaterial final : public PXR_NS::HdMaterial {
PXR_NS::HdDirtyBits *dirtyBits) override;
#if PXR_VERSION < 2011
void Reload() override
{
}
void Reload() override {}
#endif
void Finalize(PXR_NS::HdRenderParam *renderParam) override;

4
intern/cycles/hydra/mesh.cpp
View File

@ -94,9 +94,7 @@ HdCyclesMesh::HdCyclesMesh(const SdfPath &rprimId
{
}
HdCyclesMesh::~HdCyclesMesh()
{
}
HdCyclesMesh::~HdCyclesMesh() {}
HdDirtyBits HdCyclesMesh::GetInitialDirtyBitsMask() const
{

4
intern/cycles/hydra/plugin.cpp
View File

@ -35,9 +35,7 @@ HdCyclesPlugin::HdCyclesPlugin()
#endif
}
HdCyclesPlugin::~HdCyclesPlugin()
{
}
HdCyclesPlugin::~HdCyclesPlugin() {}
bool HdCyclesPlugin::IsSupported() const
{

4
intern/cycles/hydra/pointcloud.cpp
View File

@ -25,9 +25,7 @@ HdCyclesPoints::HdCyclesPoints(const SdfPath &rprimId
{
}
HdCyclesPoints::~HdCyclesPoints()
{
}
HdCyclesPoints::~HdCyclesPoints() {}
HdDirtyBits HdCyclesPoints::GetInitialDirtyBitsMask() const
{

12
intern/cycles/hydra/render_buffer.cpp
View File

@ -11,13 +11,9 @@
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)
{
@ -94,9 +90,7 @@ bool HdCyclesRenderBuffer::IsMapped() const
return _mapped != 0;
}
void HdCyclesRenderBuffer::Resolve()
{
}
void HdCyclesRenderBuffer::Resolve() {}
bool HdCyclesRenderBuffer::IsConverged() const
{

4
intern/cycles/hydra/render_delegate.cpp
View File

@ -131,9 +131,7 @@ HdCyclesDelegate::HdCyclesDelegate(const HdRenderSettingsMap &settingsMap,
}
}
HdCyclesDelegate::~HdCyclesDelegate()
{
}
HdCyclesDelegate::~HdCyclesDelegate() {}
void HdCyclesDelegate::SetDrivers(const HdDriverVector &drivers)
{

4
intern/cycles/hydra/render_pass.cpp
View File

@ -176,8 +176,6 @@ void HdCyclesRenderPass::_Execute(const HdRenderPassStateSharedPtr &renderPassSt
session->draw();
}
void HdCyclesRenderPass::_MarkCollectionDirty()
{
}
void HdCyclesRenderPass::_MarkCollectionDirty() {}
HDCYCLES_NAMESPACE_CLOSE_SCOPE

4
intern/cycles/hydra/session.cpp
View File

@ -32,9 +32,7 @@ SceneLock::SceneLock(const HdRenderParam *renderParam)
{
}
SceneLock::~SceneLock()
{
}
SceneLock::~SceneLock() {}
HdCyclesSession::HdCyclesSession(Session *session_, const bool keep_nodes)
: session(session_), keep_nodes(true), _ownCyclesSession(false)

4
intern/cycles/hydra/volume.cpp
View File

@ -30,9 +30,7 @@ HdCyclesVolume::HdCyclesVolume(const SdfPath &rprimId
{
}
HdCyclesVolume::~HdCyclesVolume()
{
}
HdCyclesVolume::~HdCyclesVolume() {}
HdDirtyBits HdCyclesVolume::GetInitialDirtyBitsMask() const
{

4
intern/cycles/integrator/adaptive_sampling.cpp
View File

@ -7,9 +7,7 @@
CCL_NAMESPACE_BEGIN
AdaptiveSampling::AdaptiveSampling()
{
}
AdaptiveSampling::AdaptiveSampling() {}
int AdaptiveSampling::align_samples(int start_sample, int num_samples) const
{

4
intern/cycles/integrator/path_trace_display.cpp
View File

@ -9,9 +9,7 @@
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)
{

4
intern/cycles/integrator/path_trace_work.cpp
View File

@ -44,9 +44,7 @@ PathTraceWork::PathTraceWork(Device *device,
{
}
PathTraceWork::~PathTraceWork()
{
}
PathTraceWork::~PathTraceWork() {}
RenderBuffers *PathTraceWork::get_render_buffers()
{

4
intern/cycles/integrator/path_trace_work.h
View File

@ -142,9 +142,7 @@ class PathTraceWork {
#ifdef WITH_PATH_GUIDING
/* 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
protected:

4
intern/cycles/integrator/path_trace_work_cpu.cpp
View File

@ -189,9 +189,7 @@ void PathTraceWorkCPU::copy_to_display(PathTraceDisplay *display,
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()
{

4
intern/cycles/integrator/work_tile_scheduler.cpp
View File

@ -11,9 +11,7 @@
CCL_NAMESPACE_BEGIN
WorkTileScheduler::WorkTileScheduler()
{
}
WorkTileScheduler::WorkTileScheduler() {}
void WorkTileScheduler::set_accelerated_rt(bool accelerated_rt)
{

4
intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
View File

@ -43,9 +43,7 @@ ccl_device int bsdf_diffuse_ramp_setup(DiffuseRampBsdf *bsdf)
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,
const float3 wi,

28
intern/cycles/kernel/integrator/shade_volume.h
View File

@ -619,7 +619,12 @@ ccl_device_forceinline void volume_integrate_heterogeneous(
const Spectrum emission = volume_emission_integrate(
&coeff, closure_flag, transmittance, dt);
accum_emission += result.indirect_throughput * emission;
guiding_record_volume_emission(kg, state, emission);
# if OPENPGL_VERSION_MINOR < 5 // WORKAROUND #104329
if (kernel_data.integrator.max_volume_bounce > 1)
# endif
{
guiding_record_volume_emission(kg, state, emission);
}
}
}
@ -961,9 +966,13 @@ ccl_device_forceinline bool integrate_volume_phase_scatter(
const Spectrum phase_weight = bsdf_eval_sum(&phase_eval) / phase_pdf;
/* Add phase function sampling data to the path segment. */
guiding_record_volume_bounce(
kg, state, sd, phase_weight, phase_pdf, normalize(phase_wo), sampled_roughness);
# if OPENPGL_VERSION_MINOR < 5 // WORKAROUND #104329
if (kernel_data.integrator.max_volume_bounce > 1)
# endif
{
guiding_record_volume_bounce(
kg, state, sd, phase_weight, phase_pdf, normalize(phase_wo), sampled_roughness);
}
/* Update throughput. */
const Spectrum throughput = INTEGRATOR_STATE(state, path, throughput);
const Spectrum throughput_phase = throughput * phase_weight;
@ -1058,7 +1067,11 @@ ccl_device VolumeIntegrateEvent volume_integrate(KernelGlobals kg,
const float3 direct_P = ray->P + result.direct_t * ray->D;
# ifdef __PATH_GUIDING__
# if OPENPGL_VERSION_MINOR < 5 // WORKAROUND #104329
if (kernel_data.integrator.use_guiding && kernel_data.integrator.max_volume_bounce > 1) {
# else
if (kernel_data.integrator.use_guiding) {
# endif
# if PATH_GUIDING_LEVEL >= 1
if (result.direct_sample_method == VOLUME_SAMPLE_DISTANCE) {
/* If the direct scatter event is generated using VOLUME_SAMPLE_DISTANCE the direct event
@ -1131,7 +1144,12 @@ ccl_device VolumeIntegrateEvent volume_integrate(KernelGlobals kg,
# if defined(__PATH_GUIDING__)
# if PATH_GUIDING_LEVEL >= 1
if (!guiding_generated_new_segment) {
guiding_record_volume_segment(kg, state, sd.P, sd.wi);
# if OPENPGL_VERSION_MINOR < 5 // WORKAROUND #104329
if (kernel_data.integrator.max_volume_bounce > 1)
# endif
{
guiding_record_volume_segment(kg, state, sd.P, sd.wi);
}
}
# endif
# if PATH_GUIDING_LEVEL >= 4

4
intern/cycles/kernel/integrator/surface_shader.h
View File

@ -179,8 +179,8 @@ ccl_device_inline void surface_shader_validate_bsdf_sample(const KernelGlobals k
const float2 org_roughness,
const float org_eta)
{
/* Validate the the bsdf_label and bsdf_roughness_eta functions
* by estimating the values after a bsdf sample. */
/* Validate the #bsdf_label and #bsdf_roughness_eta functions
* by estimating the values after a BSDF sample. */
const int comp_label = bsdf_label(kg, sc, wo);
kernel_assert(org_label == comp_label);

68
intern/cycles/kernel/osl/services_gpu.h
View File

@ -256,13 +256,9 @@ ccl_device_extern ccl_private OSLClosure *osl_allocate_weighted_closure_componen
#include "kernel/svm/math_util.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)
{
@ -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)
{

4
intern/cycles/kernel/osl/shaders/node_holdout.osl
View File

@ -3,6 +3,4 @@
#include "stdcycles.h"
shader node_holdout(output closure color Holdout = holdout())
{
}
shader node_holdout(output closure color Holdout = holdout()) {}

4
intern/cycles/scene/alembic.cpp
View File

@ -433,9 +433,7 @@ AlembicObject::AlembicObject() : Node(get_node_type())
schema_type = INVALID;
}
AlembicObject::~AlembicObject()
{
}
AlembicObject::~AlembicObject() {}
void AlembicObject::set_object(Object *object_)
{

12
intern/cycles/scene/attribute.cpp
View File

@ -460,9 +460,7 @@ AttributeSet::AttributeSet(Geometry *geometry, AttributePrimitive prim)
{
}
AttributeSet::~AttributeSet()
{
}
AttributeSet::~AttributeSet() {}
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() {}
bool AttributeRequestSet::modified(const AttributeRequestSet &other)
{

4
intern/cycles/scene/background.cpp
View File

@ -116,9 +116,7 @@ void Background::device_update(Device *device, DeviceScene *dscene, Scene *scene
clear_modified();
}
void Background::device_free(Device * /*device*/, DeviceScene * /*dscene*/)
{
}
void Background::device_free(Device * /*device*/, DeviceScene * /*dscene*/) {}
void Background::tag_update(Scene *scene)
{

8
intern/cycles/scene/bake.cpp
View File

@ -19,9 +19,7 @@ BakeManager::BakeManager()
use_camera_ = false;
}
BakeManager::~BakeManager()
{
}
BakeManager::~BakeManager() {}
bool BakeManager::get_baking() const
{
@ -85,9 +83,7 @@ void BakeManager::device_update(Device * /*device*/,
need_update_ = false;
}
void BakeManager::device_free(Device * /*device*/, DeviceScene * /*dscene*/)
{
}
void BakeManager::device_free(Device * /*device*/, DeviceScene * /*dscene*/) {}
void BakeManager::tag_update()
{

4
intern/cycles/scene/camera.cpp
View File

@ -188,9 +188,7 @@ Camera::Camera() : Node(get_node_type())
memset((void *)&kernel_camera, 0, sizeof(kernel_camera));
}
Camera::~Camera()
{
}
Camera::~Camera() {}
void Camera::compute_auto_viewplane()
{

8
intern/cycles/scene/film.cpp
View File

@ -123,13 +123,9 @@ NODE_DEFINE(Film)
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)
{

4
intern/cycles/scene/geometry.cpp
View File

@ -301,9 +301,7 @@ GeometryManager::GeometryManager()
need_flags_update = true;
}
GeometryManager::~GeometryManager()
{
}
GeometryManager::~GeometryManager() {}
void GeometryManager::update_osl_globals(Device *device, Scene *scene)
{

4
intern/cycles/scene/hair.cpp
View File

@ -313,9 +313,7 @@ Hair::Hair() : Geometry(get_node_type(), Geometry::HAIR)
curve_shape = CURVE_RIBBON;
}
Hair::~Hair()
{
}
Hair::~Hair() {}
void Hair::resize_curves(int numcurves, int numkeys)
{

8
intern/cycles/scene/image.cpp
View File

@ -80,9 +80,7 @@ const char *name_from_type(ImageDataType type)
/* Image Handle */
ImageHandle::ImageHandle() : manager(NULL)
{
}
ImageHandle::ImageHandle() : manager(NULL) {}
ImageHandle::ImageHandle(const ImageHandle &other)
: tile_slots(other.tile_slots), manager(other.manager)
@ -290,9 +288,7 @@ void ImageMetaData::detect_colorspace()
/* Image Loader */
ImageLoader::ImageLoader()
{
}
ImageLoader::ImageLoader() {}
ustring ImageLoader::osl_filepath() const
{

8
intern/cycles/scene/image_oiio.cpp
View File

@ -9,13 +9,9 @@
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*/,
ImageMetaData &metadata)

8
intern/cycles/scene/image_vdb.cpp
View File

@ -87,13 +87,9 @@ VDBImageLoader::VDBImageLoader(openvdb::GridBase::ConstPtr grid_, const string &
}
#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)
{

8
intern/cycles/scene/integrator.cpp
View File

@ -139,13 +139,9 @@ NODE_DEFINE(Integrator)
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)
{

4
intern/cycles/scene/light.cpp
View File

@ -569,10 +569,10 @@ void LightManager::device_update_tree(Device *,
* To do so, we repeatedly move to the left child of the current node until we reach the leftmost
* descendant, while keeping track of the right child of each node we visited by storing the
* pointer in the `right_node_stack`.
* Once finished visiting the left subtree, we retrieve the the last stored pointer from
* Once finished visiting the left subtree, we retrieve the last stored pointer from
* `right_node_stack`, assign it to its parent (retrieved from `left_index_stack`), and repeat
* the process from there. */
int left_index_stack[32]; /* sizeof(bit_trail) * 8 == 32 */
int left_index_stack[32]; /* `sizeof(bit_trail) * 8 == 32`. */
LightTreeNode *right_node_stack[32];
int stack_id = 0;
const LightTreeNode *node = light_tree.get_root();

8
intern/cycles/scene/light_tree.h
View File

@ -23,9 +23,7 @@ struct OrientationBounds {
float theta_o; /* angle bounding the normals */
float theta_e; /* angle bounding the light emissions */
__forceinline OrientationBounds()
{
}
__forceinline OrientationBounds() {}
__forceinline OrientationBounds(const float3 &axis_, float theta_o_, float theta_e_)
: axis(axis_), theta_o(theta_o_), theta_e(theta_e_)
@ -69,9 +67,7 @@ struct LightTreePrimitivesMeasure {
__forceinline LightTreePrimitivesMeasure() = default;
__forceinline LightTreePrimitivesMeasure(empty_t)
{
}
__forceinline LightTreePrimitivesMeasure(empty_t) {}
__forceinline LightTreePrimitivesMeasure(const BoundBox &bbox,
const OrientationBounds &bcone,

4
intern/cycles/scene/mesh.cpp
View File

@ -192,9 +192,7 @@ Mesh::Mesh(const NodeType *node_type, Type geom_type_)
patch_table = NULL;
}
Mesh::Mesh() : Mesh(get_node_type(), Geometry::MESH)
{
}
Mesh::Mesh() : Mesh(get_node_type(), Geometry::MESH) {}
Mesh::~Mesh()
{

16
intern/cycles/scene/mesh_subdivision.cpp
View File

@ -150,9 +150,7 @@ using namespace OpenSubdiv;
template<typename T> struct OsdValue {
T value;
OsdValue()
{
}
OsdValue() {}
void Clear(void * = 0)
{
@ -182,9 +180,7 @@ class OsdData {
Far::PatchMap *patch_map;
public:
OsdData() : mesh(NULL), refiner(NULL), patch_table(NULL), patch_map(NULL)
{
}
OsdData() : mesh(NULL), refiner(NULL), patch_table(NULL), patch_map(NULL) {}
~OsdData()
{
@ -353,12 +349,8 @@ class OsdData {
struct OsdPatch : Patch {
OsdData *osd_data;
OsdPatch()
{
}
OsdPatch(OsdData *data) : osd_data(data)
{
}
OsdPatch() {}
OsdPatch(OsdData *data) : osd_data(data) {}
void eval(float3 *P, float3 *dPdu, float3 *dPdv, float3 *N, float u, float v)
{

8
intern/cycles/scene/object.cpp
View File

@ -113,9 +113,7 @@ Object::Object() : Node(get_node_type())
intersects_volume = false;
}
Object::~Object()
{
}
Object::~Object() {}
void Object::update_motion()
{
@ -380,9 +378,7 @@ ObjectManager::ObjectManager()
need_flags_update = true;
}
ObjectManager::~ObjectManager()
{
}
ObjectManager::~ObjectManager() {}
static float object_volume_density(const Transform &tfm, Geometry *geom)
{

60
intern/cycles/scene/osl.cpp
View File

@ -1348,57 +1348,31 @@ void OSLCompiler::parameter_texture_ies(const char *name, int svm_slot)
#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 */,
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 */

12
intern/cycles/scene/particles.cpp
View File

@ -23,13 +23,9 @@ NODE_DEFINE(ParticleSystem)
return type;
}
ParticleSystem::ParticleSystem() : Node(get_node_type())
{
}
ParticleSystem::ParticleSystem() : Node(get_node_type()) {}
ParticleSystem::~ParticleSystem()
{
}
ParticleSystem::~ParticleSystem() {}
void ParticleSystem::tag_update(Scene *scene)
{
@ -43,9 +39,7 @@ ParticleSystemManager::ParticleSystemManager()
need_update_ = true;
}
ParticleSystemManager::~ParticleSystemManager()
{
}
ParticleSystemManager::~ParticleSystemManager() {}
void ParticleSystemManager::device_update_particles(Device *,
DeviceScene *dscene,

4
intern/cycles/scene/pass.cpp
View File

@ -134,9 +134,7 @@ NODE_DEFINE(Pass)
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
{

8
intern/cycles/scene/pointcloud.cpp
View File

@ -93,13 +93,9 @@ NODE_DEFINE(PointCloud)
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)
{

12
intern/cycles/scene/procedural.cpp
View File

@ -16,22 +16,16 @@ NODE_ABSTRACT_DEFINE(Procedural)
return type;
}
Procedural::Procedural(const NodeType *type) : Node(type)
{
}
Procedural::Procedural(const NodeType *type) : Node(type) {}
Procedural::~Procedural()
{
}
Procedural::~Procedural() {}
ProceduralManager::ProceduralManager()
{
need_update_ = true;
}
ProceduralManager::~ProceduralManager()
{
}
ProceduralManager::~ProceduralManager() {}
void ProceduralManager::update(Scene *scene, Progress &progress)
{

4
intern/cycles/scene/shader.cpp
View File

@ -397,9 +397,7 @@ ShaderManager::ShaderManager()
init_xyz_transforms();
}
ShaderManager::~ShaderManager()
{
}
ShaderManager::~ShaderManager() {}
ShaderManager *ShaderManager::create(int shadingsystem, Device *device)
{

8
intern/cycles/scene/shader_graph.h
View File

@ -160,15 +160,11 @@ class ShaderNode : public Node {
virtual void compile(OSLCompiler &compiler) = 0;
/* Expand node into additional nodes. */
virtual void expand(ShaderGraph * /* graph */)
{
}
virtual void expand(ShaderGraph * /* graph */) {}
/* ** Node optimization ** */
/* 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
* evaluate in the kernel but keep the final result unchanged.

316
intern/cycles/scene/shader_nodes.cpp
View File

@ -64,9 +64,7 @@ CCL_NAMESPACE_BEGIN
mapping_projection_enum.insert("sphere", TextureMapping::SPHERE); \
SOCKET_ENUM(tex_mapping.projection, "Projection", mapping_projection_enum, TextureMapping::FLAT);
TextureMapping::TextureMapping()
{
}
TextureMapping::TextureMapping() {}
Transform TextureMapping::compute_transform()
{
@ -873,9 +871,7 @@ NODE_DEFINE(SkyTextureNode)
return type;
}
SkyTextureNode::SkyTextureNode() : TextureNode(get_node_type())
{
}
SkyTextureNode::SkyTextureNode() : TextureNode(get_node_type()) {}
void SkyTextureNode::compile(SVMCompiler &compiler)
{
@ -1055,9 +1051,7 @@ NODE_DEFINE(GradientTextureNode)
return type;
}
GradientTextureNode::GradientTextureNode() : TextureNode(get_node_type())
{
}
GradientTextureNode::GradientTextureNode() : TextureNode(get_node_type()) {}
void GradientTextureNode::compile(SVMCompiler &compiler)
{
@ -1112,9 +1106,7 @@ NODE_DEFINE(NoiseTextureNode)
return type;
}
NoiseTextureNode::NoiseTextureNode() : TextureNode(get_node_type())
{
}
NoiseTextureNode::NoiseTextureNode() : TextureNode(get_node_type()) {}
void NoiseTextureNode::compile(SVMCompiler &compiler)
{
@ -1205,9 +1197,7 @@ NODE_DEFINE(VoronoiTextureNode)
return type;
}
VoronoiTextureNode::VoronoiTextureNode() : TextureNode(get_node_type())
{
}
VoronoiTextureNode::VoronoiTextureNode() : TextureNode(get_node_type()) {}
void VoronoiTextureNode::compile(SVMCompiler &compiler)
{
@ -1376,9 +1366,7 @@ NODE_DEFINE(WhiteNoiseTextureNode)
return type;
}
WhiteNoiseTextureNode::WhiteNoiseTextureNode() : ShaderNode(get_node_type())
{
}
WhiteNoiseTextureNode::WhiteNoiseTextureNode() : ShaderNode(get_node_type()) {}
void WhiteNoiseTextureNode::compile(SVMCompiler &compiler)
{
@ -1441,9 +1429,7 @@ NODE_DEFINE(MusgraveTextureNode)
return type;
}
MusgraveTextureNode::MusgraveTextureNode() : TextureNode(get_node_type())
{
}
MusgraveTextureNode::MusgraveTextureNode() : TextureNode(get_node_type()) {}
void MusgraveTextureNode::compile(SVMCompiler &compiler)
{
@ -1539,9 +1525,7 @@ NODE_DEFINE(WaveTextureNode)
return type;
}
WaveTextureNode::WaveTextureNode() : TextureNode(get_node_type())
{
}
WaveTextureNode::WaveTextureNode() : TextureNode(get_node_type()) {}
void WaveTextureNode::compile(SVMCompiler &compiler)
{
@ -1616,9 +1600,7 @@ NODE_DEFINE(MagicTextureNode)
return type;
}
MagicTextureNode::MagicTextureNode() : TextureNode(get_node_type())
{
}
MagicTextureNode::MagicTextureNode() : TextureNode(get_node_type()) {}
void MagicTextureNode::compile(SVMCompiler &compiler)
{
@ -1669,9 +1651,7 @@ NODE_DEFINE(CheckerTextureNode)
return type;
}
CheckerTextureNode::CheckerTextureNode() : TextureNode(get_node_type())
{
}
CheckerTextureNode::CheckerTextureNode() : TextureNode(get_node_type()) {}
void CheckerTextureNode::compile(SVMCompiler &compiler)
{
@ -1735,9 +1715,7 @@ NODE_DEFINE(BrickTextureNode)
return type;
}
BrickTextureNode::BrickTextureNode() : TextureNode(get_node_type())
{
}
BrickTextureNode::BrickTextureNode() : TextureNode(get_node_type()) {}
void BrickTextureNode::compile(SVMCompiler &compiler)
{
@ -1828,13 +1806,9 @@ NODE_DEFINE(PointDensityTextureNode)
return type;
}
PointDensityTextureNode::PointDensityTextureNode() : ShaderNode(get_node_type())
{
}
PointDensityTextureNode::PointDensityTextureNode() : ShaderNode(get_node_type()) {}
PointDensityTextureNode::~PointDensityTextureNode()
{
}
PointDensityTextureNode::~PointDensityTextureNode() {}
ShaderNode *PointDensityTextureNode::clone(ShaderGraph *graph) const
{
@ -1945,9 +1919,7 @@ NODE_DEFINE(NormalNode)
return type;
}
NormalNode::NormalNode() : ShaderNode(get_node_type())
{
}
NormalNode::NormalNode() : ShaderNode(get_node_type()) {}
void NormalNode::compile(SVMCompiler &compiler)
{
@ -1992,9 +1964,7 @@ NODE_DEFINE(MappingNode)
return type;
}
MappingNode::MappingNode() : ShaderNode(get_node_type())
{
}
MappingNode::MappingNode() : ShaderNode(get_node_type()) {}
void MappingNode::constant_fold(const ConstantFolder &folder)
{
@ -2047,9 +2017,7 @@ NODE_DEFINE(RGBToBWNode)
return type;
}
RGBToBWNode::RGBToBWNode() : ShaderNode(get_node_type())
{
}
RGBToBWNode::RGBToBWNode() : ShaderNode(get_node_type()) {}
void RGBToBWNode::constant_fold(const ConstantFolder &folder)
{
@ -2295,9 +2263,7 @@ bool BsdfBaseNode::has_bump()
/* 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,
ShaderInput *param1,
@ -3176,9 +3142,7 @@ NODE_DEFINE(EmissionNode)
return type;
}
EmissionNode::EmissionNode() : ShaderNode(get_node_type())
{
}
EmissionNode::EmissionNode() : ShaderNode(get_node_type()) {}
void EmissionNode::compile(SVMCompiler &compiler)
{
@ -3225,9 +3189,7 @@ NODE_DEFINE(BackgroundNode)
return type;
}
BackgroundNode::BackgroundNode() : ShaderNode(get_node_type())
{
}
BackgroundNode::BackgroundNode() : ShaderNode(get_node_type()) {}
void BackgroundNode::compile(SVMCompiler &compiler)
{
@ -3273,9 +3235,7 @@ NODE_DEFINE(HoldoutNode)
return type;
}
HoldoutNode::HoldoutNode() : ShaderNode(get_node_type())
{
}
HoldoutNode::HoldoutNode() : ShaderNode(get_node_type()) {}
void HoldoutNode::compile(SVMCompiler &compiler)
{
@ -3311,9 +3271,7 @@ NODE_DEFINE(AmbientOcclusionNode)
return type;
}
AmbientOcclusionNode::AmbientOcclusionNode() : ShaderNode(get_node_type())
{
}
AmbientOcclusionNode::AmbientOcclusionNode() : ShaderNode(get_node_type()) {}
void AmbientOcclusionNode::compile(SVMCompiler &compiler)
{
@ -3883,9 +3841,7 @@ NODE_DEFINE(TextureCoordinateNode)
return type;
}
TextureCoordinateNode::TextureCoordinateNode() : ShaderNode(get_node_type())
{
}
TextureCoordinateNode::TextureCoordinateNode() : ShaderNode(get_node_type()) {}
void TextureCoordinateNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -4030,9 +3986,7 @@ NODE_DEFINE(UVMapNode)
return type;
}
UVMapNode::UVMapNode() : ShaderNode(get_node_type())
{
}
UVMapNode::UVMapNode() : ShaderNode(get_node_type()) {}
void UVMapNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -4119,9 +4073,7 @@ NODE_DEFINE(LightPathNode)
return type;
}
LightPathNode::LightPathNode() : ShaderNode(get_node_type())
{
}
LightPathNode::LightPathNode() : ShaderNode(get_node_type()) {}
void LightPathNode::compile(SVMCompiler &compiler)
{
@ -4219,9 +4171,7 @@ NODE_DEFINE(LightFalloffNode)
return type;
}
LightFalloffNode::LightFalloffNode() : ShaderNode(get_node_type())
{
}
LightFalloffNode::LightFalloffNode() : ShaderNode(get_node_type()) {}
void LightFalloffNode::compile(SVMCompiler &compiler)
{
@ -4277,9 +4227,7 @@ NODE_DEFINE(ObjectInfoNode)
return type;
}
ObjectInfoNode::ObjectInfoNode() : ShaderNode(get_node_type())
{
}
ObjectInfoNode::ObjectInfoNode() : ShaderNode(get_node_type()) {}
void ObjectInfoNode::compile(SVMCompiler &compiler)
{
@ -4340,9 +4288,7 @@ NODE_DEFINE(ParticleInfoNode)
return type;
}
ParticleInfoNode::ParticleInfoNode() : ShaderNode(get_node_type())
{
}
ParticleInfoNode::ParticleInfoNode() : ShaderNode(get_node_type()) {}
void ParticleInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -4445,9 +4391,7 @@ NODE_DEFINE(HairInfoNode)
return type;
}
HairInfoNode::HairInfoNode() : ShaderNode(get_node_type())
{
}
HairInfoNode::HairInfoNode() : ShaderNode(get_node_type()) {}
void HairInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -4523,9 +4467,7 @@ NODE_DEFINE(PointInfoNode)
return type;
}
PointInfoNode::PointInfoNode() : ShaderNode(get_node_type())
{
}
PointInfoNode::PointInfoNode() : ShaderNode(get_node_type()) {}
void PointInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -4577,9 +4519,7 @@ NODE_DEFINE(VolumeInfoNode)
return type;
}
VolumeInfoNode::VolumeInfoNode() : ShaderNode(get_node_type())
{
}
VolumeInfoNode::VolumeInfoNode() : ShaderNode(get_node_type()) {}
/* The requested attributes are not updated after node expansion.
* 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)
{
@ -4658,9 +4594,7 @@ NODE_DEFINE(VertexColorNode)
return type;
}
VertexColorNode::VertexColorNode() : ShaderNode(get_node_type())
{
}
VertexColorNode::VertexColorNode() : ShaderNode(get_node_type()) {}
void VertexColorNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -4739,9 +4673,7 @@ NODE_DEFINE(ValueNode)
return type;
}
ValueNode::ValueNode() : ShaderNode(get_node_type())
{
}
ValueNode::ValueNode() : ShaderNode(get_node_type()) {}
void ValueNode::constant_fold(const ConstantFolder &folder)
{
@ -4773,9 +4705,7 @@ NODE_DEFINE(ColorNode)
return type;
}
ColorNode::ColorNode() : ShaderNode(get_node_type())
{
}
ColorNode::ColorNode() : ShaderNode(get_node_type()) {}
void ColorNode::constant_fold(const ConstantFolder &folder)
{
@ -4910,9 +4840,7 @@ NODE_DEFINE(MixClosureWeightNode)
return type;
}
MixClosureWeightNode::MixClosureWeightNode() : ShaderNode(get_node_type())
{
}
MixClosureWeightNode::MixClosureWeightNode() : ShaderNode(get_node_type()) {}
void MixClosureWeightNode::compile(SVMCompiler &compiler)
{
@ -4947,9 +4875,7 @@ NODE_DEFINE(InvertNode)
return type;
}
InvertNode::InvertNode() : ShaderNode(get_node_type())
{
}
InvertNode::InvertNode() : ShaderNode(get_node_type()) {}
void InvertNode::constant_fold(const ConstantFolder &folder)
{
@ -5024,9 +4950,7 @@ NODE_DEFINE(MixNode)
return type;
}
MixNode::MixNode() : ShaderNode(get_node_type())
{
}
MixNode::MixNode() : ShaderNode(get_node_type()) {}
void MixNode::compile(SVMCompiler &compiler)
{
@ -5103,9 +5027,7 @@ NODE_DEFINE(MixColorNode)
return type;
}
MixColorNode::MixColorNode() : ShaderNode(get_node_type())
{
}
MixColorNode::MixColorNode() : ShaderNode(get_node_type()) {}
void MixColorNode::compile(SVMCompiler &compiler)
{
@ -5161,9 +5083,7 @@ NODE_DEFINE(MixFloatNode)
return type;
}
MixFloatNode::MixFloatNode() : ShaderNode(get_node_type())
{
}
MixFloatNode::MixFloatNode() : ShaderNode(get_node_type()) {}
void MixFloatNode::compile(SVMCompiler &compiler)
{
@ -5218,9 +5138,7 @@ NODE_DEFINE(MixVectorNode)
return type;
}
MixVectorNode::MixVectorNode() : ShaderNode(get_node_type())
{
}
MixVectorNode::MixVectorNode() : ShaderNode(get_node_type()) {}
void MixVectorNode::compile(SVMCompiler &compiler)
{
@ -5274,9 +5192,7 @@ NODE_DEFINE(MixVectorNonUniformNode)
return type;
}
MixVectorNonUniformNode::MixVectorNonUniformNode() : ShaderNode(get_node_type())
{
}
MixVectorNonUniformNode::MixVectorNonUniformNode() : ShaderNode(get_node_type()) {}
void MixVectorNonUniformNode::compile(SVMCompiler &compiler)
{
@ -5332,9 +5248,7 @@ NODE_DEFINE(CombineColorNode)
return type;
}
CombineColorNode::CombineColorNode() : ShaderNode(get_node_type())
{
}
CombineColorNode::CombineColorNode() : ShaderNode(get_node_type()) {}
void CombineColorNode::constant_fold(const ConstantFolder &folder)
{
@ -5383,9 +5297,7 @@ NODE_DEFINE(CombineRGBNode)
return type;
}
CombineRGBNode::CombineRGBNode() : ShaderNode(get_node_type())
{
}
CombineRGBNode::CombineRGBNode() : ShaderNode(get_node_type()) {}
void CombineRGBNode::constant_fold(const ConstantFolder &folder)
{
@ -5431,9 +5343,7 @@ NODE_DEFINE(CombineXYZNode)
return type;
}
CombineXYZNode::CombineXYZNode() : ShaderNode(get_node_type())
{
}
CombineXYZNode::CombineXYZNode() : ShaderNode(get_node_type()) {}
void CombineXYZNode::constant_fold(const ConstantFolder &folder)
{
@ -5479,9 +5389,7 @@ NODE_DEFINE(CombineHSVNode)
return type;
}
CombineHSVNode::CombineHSVNode() : ShaderNode(get_node_type())
{
}
CombineHSVNode::CombineHSVNode() : ShaderNode(get_node_type()) {}
void CombineHSVNode::constant_fold(const ConstantFolder &folder)
{
@ -5522,9 +5430,7 @@ NODE_DEFINE(GammaNode)
return type;
}
GammaNode::GammaNode() : ShaderNode(get_node_type())
{
}
GammaNode::GammaNode() : ShaderNode(get_node_type()) {}
void GammaNode::constant_fold(const ConstantFolder &folder)
{
@ -5578,9 +5484,7 @@ NODE_DEFINE(BrightContrastNode)
return type;
}
BrightContrastNode::BrightContrastNode() : ShaderNode(get_node_type())
{
}
BrightContrastNode::BrightContrastNode() : ShaderNode(get_node_type()) {}
void BrightContrastNode::constant_fold(const ConstantFolder &folder)
{
@ -5629,9 +5533,7 @@ NODE_DEFINE(SeparateColorNode)
return type;
}
SeparateColorNode::SeparateColorNode() : ShaderNode(get_node_type())
{
}
SeparateColorNode::SeparateColorNode() : ShaderNode(get_node_type()) {}
void SeparateColorNode::constant_fold(const ConstantFolder &folder)
{
@ -5687,9 +5589,7 @@ NODE_DEFINE(SeparateRGBNode)
return type;
}
SeparateRGBNode::SeparateRGBNode() : ShaderNode(get_node_type())
{
}
SeparateRGBNode::SeparateRGBNode() : ShaderNode(get_node_type()) {}
void SeparateRGBNode::constant_fold(const ConstantFolder &folder)
{
@ -5740,9 +5640,7 @@ NODE_DEFINE(SeparateXYZNode)
return type;
}
SeparateXYZNode::SeparateXYZNode() : ShaderNode(get_node_type())
{
}
SeparateXYZNode::SeparateXYZNode() : ShaderNode(get_node_type()) {}
void SeparateXYZNode::constant_fold(const ConstantFolder &folder)
{
@ -5793,9 +5691,7 @@ NODE_DEFINE(SeparateHSVNode)
return type;
}
SeparateHSVNode::SeparateHSVNode() : ShaderNode(get_node_type())
{
}
SeparateHSVNode::SeparateHSVNode() : ShaderNode(get_node_type()) {}
void SeparateHSVNode::constant_fold(const ConstantFolder &folder)
{
@ -5847,9 +5743,7 @@ NODE_DEFINE(HSVNode)
return type;
}
HSVNode::HSVNode() : ShaderNode(get_node_type())
{
}
HSVNode::HSVNode() : ShaderNode(get_node_type()) {}
void HSVNode::compile(SVMCompiler &compiler)
{
@ -5890,9 +5784,7 @@ NODE_DEFINE(AttributeNode)
return type;
}
AttributeNode::AttributeNode() : ShaderNode(get_node_type())
{
}
AttributeNode::AttributeNode() : ShaderNode(get_node_type()) {}
void AttributeNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -5978,9 +5870,7 @@ NODE_DEFINE(CameraNode)
return type;
}
CameraNode::CameraNode() : ShaderNode(get_node_type())
{
}
CameraNode::CameraNode() : ShaderNode(get_node_type()) {}
void CameraNode::compile(SVMCompiler &compiler)
{
@ -6014,9 +5904,7 @@ NODE_DEFINE(FresnelNode)
return type;
}
FresnelNode::FresnelNode() : ShaderNode(get_node_type())
{
}
FresnelNode::FresnelNode() : ShaderNode(get_node_type()) {}
void FresnelNode::compile(SVMCompiler &compiler)
{
@ -6052,9 +5940,7 @@ NODE_DEFINE(LayerWeightNode)
return type;
}
LayerWeightNode::LayerWeightNode() : ShaderNode(get_node_type())
{
}
LayerWeightNode::LayerWeightNode() : ShaderNode(get_node_type()) {}
void LayerWeightNode::compile(SVMCompiler &compiler)
{
@ -6100,9 +5986,7 @@ NODE_DEFINE(WireframeNode)
return type;
}
WireframeNode::WireframeNode() : ShaderNode(get_node_type())
{
}
WireframeNode::WireframeNode() : ShaderNode(get_node_type()) {}
void WireframeNode::compile(SVMCompiler &compiler)
{
@ -6148,9 +6032,7 @@ NODE_DEFINE(WavelengthNode)
return type;
}
WavelengthNode::WavelengthNode() : ShaderNode(get_node_type())
{
}
WavelengthNode::WavelengthNode() : ShaderNode(get_node_type()) {}
void WavelengthNode::compile(SVMCompiler &compiler)
{
@ -6178,9 +6060,7 @@ NODE_DEFINE(BlackbodyNode)
return type;
}
BlackbodyNode::BlackbodyNode() : ShaderNode(get_node_type())
{
}
BlackbodyNode::BlackbodyNode() : ShaderNode(get_node_type()) {}
void BlackbodyNode::constant_fold(const ConstantFolder &folder)
{
@ -6271,9 +6151,7 @@ NODE_DEFINE(MapRangeNode)
return type;
}
MapRangeNode::MapRangeNode() : ShaderNode(get_node_type())
{
}
MapRangeNode::MapRangeNode() : ShaderNode(get_node_type()) {}
void MapRangeNode::expand(ShaderGraph *graph)
{
@ -6365,13 +6243,9 @@ NODE_DEFINE(VectorMapRangeNode)
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)
{
@ -6426,9 +6300,7 @@ NODE_DEFINE(ClampNode)
return type;
}
ClampNode::ClampNode() : ShaderNode(get_node_type())
{
}
ClampNode::ClampNode() : ShaderNode(get_node_type()) {}
void ClampNode::constant_fold(const ConstantFolder &folder)
{
@ -6579,9 +6451,7 @@ NODE_DEFINE(MathNode)
return type;
}
MathNode::MathNode() : ShaderNode(get_node_type())
{
}
MathNode::MathNode() : ShaderNode(get_node_type()) {}
void MathNode::expand(ShaderGraph *graph)
{
@ -6686,9 +6556,7 @@ NODE_DEFINE(VectorMathNode)
return type;
}
VectorMathNode::VectorMathNode() : ShaderNode(get_node_type())
{
}
VectorMathNode::VectorMathNode() : ShaderNode(get_node_type()) {}
void VectorMathNode::constant_fold(const ConstantFolder &folder)
{
@ -6776,9 +6644,7 @@ NODE_DEFINE(VectorRotateNode)
return type;
}
VectorRotateNode::VectorRotateNode() : ShaderNode(get_node_type())
{
}
VectorRotateNode::VectorRotateNode() : ShaderNode(get_node_type()) {}
void VectorRotateNode::compile(SVMCompiler &compiler)
{
@ -6832,9 +6698,7 @@ NODE_DEFINE(VectorTransformNode)
return type;
}
VectorTransformNode::VectorTransformNode() : ShaderNode(get_node_type())
{
}
VectorTransformNode::VectorTransformNode() : ShaderNode(get_node_type()) {}
void VectorTransformNode::compile(SVMCompiler &compiler)
{
@ -6936,9 +6800,7 @@ void BumpNode::constant_fold(const ConstantFolder &folder)
/* 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)
{
@ -7030,9 +6892,7 @@ NODE_DEFINE(RGBCurvesNode)
return type;
}
RGBCurvesNode::RGBCurvesNode() : CurvesNode(get_node_type())
{
}
RGBCurvesNode::RGBCurvesNode() : CurvesNode(get_node_type()) {}
void RGBCurvesNode::constant_fold(const ConstantFolder &folder)
{
@ -7068,9 +6928,7 @@ NODE_DEFINE(VectorCurvesNode)
return type;
}
VectorCurvesNode::VectorCurvesNode() : CurvesNode(get_node_type())
{
}
VectorCurvesNode::VectorCurvesNode() : CurvesNode(get_node_type()) {}
void VectorCurvesNode::constant_fold(const ConstantFolder &folder)
{
@ -7106,9 +6964,7 @@ NODE_DEFINE(FloatCurveNode)
return type;
}
FloatCurveNode::FloatCurveNode() : ShaderNode(get_node_type())
{
}
FloatCurveNode::FloatCurveNode() : ShaderNode(get_node_type()) {}
void FloatCurveNode::constant_fold(const ConstantFolder &folder)
{
@ -7185,9 +7041,7 @@ NODE_DEFINE(RGBRampNode)
return type;
}
RGBRampNode::RGBRampNode() : ShaderNode(get_node_type())
{
}
RGBRampNode::RGBRampNode() : ShaderNode(get_node_type()) {}
void RGBRampNode::constant_fold(const ConstantFolder &folder)
{
@ -7258,9 +7112,7 @@ NODE_DEFINE(SetNormalNode)
return type;
}
SetNormalNode::SetNormalNode() : ShaderNode(get_node_type())
{
}
SetNormalNode::SetNormalNode() : ShaderNode(get_node_type()) {}
void SetNormalNode::compile(SVMCompiler &compiler)
{
@ -7379,9 +7231,7 @@ NODE_DEFINE(NormalMapNode)
return type;
}
NormalMapNode::NormalMapNode() : ShaderNode(get_node_type())
{
}
NormalMapNode::NormalMapNode() : ShaderNode(get_node_type()) {}
void NormalMapNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -7469,9 +7319,7 @@ NODE_DEFINE(TangentNode)
return type;
}
TangentNode::TangentNode() : ShaderNode(get_node_type())
{
}
TangentNode::TangentNode() : ShaderNode(get_node_type()) {}
void TangentNode::attributes(Shader *shader, AttributeRequestSet *attributes)
{
@ -7539,9 +7387,7 @@ NODE_DEFINE(BevelNode)
return type;
}
BevelNode::BevelNode() : ShaderNode(get_node_type())
{
}
BevelNode::BevelNode() : ShaderNode(get_node_type()) {}
void BevelNode::compile(SVMCompiler &compiler)
{
@ -7584,9 +7430,7 @@ NODE_DEFINE(DisplacementNode)
return type;
}
DisplacementNode::DisplacementNode() : ShaderNode(get_node_type())
{
}
DisplacementNode::DisplacementNode() : ShaderNode(get_node_type()) {}
void DisplacementNode::constant_fold(const ConstantFolder &folder)
{
@ -7643,9 +7487,7 @@ NODE_DEFINE(VectorDisplacementNode)
return type;
}
VectorDisplacementNode::VectorDisplacementNode() : ShaderNode(get_node_type())
{
}
VectorDisplacementNode::VectorDisplacementNode() : ShaderNode(get_node_type()) {}
void VectorDisplacementNode::constant_fold(const ConstantFolder &folder)
{

4
intern/cycles/scene/shader_nodes.h
View File

@ -53,9 +53,7 @@ class TextureMapping {
class TextureNode : public ShaderNode {
public:
explicit TextureNode(const NodeType *node_type) : ShaderNode(node_type)
{
}
explicit TextureNode(const NodeType *node_type) : ShaderNode(node_type) {}
TextureMapping tex_mapping;
NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, translation)
NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, rotation)

44
intern/cycles/scene/stats.cpp
View File

@ -40,27 +40,17 @@ bool namedSampleCountPairComparator(const NamedSampleCountPair &a, const NamedSa
} // 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. */
NamedSizeStats::NamedSizeStats() : total_size(0)
{
}
NamedSizeStats::NamedSizeStats() : total_size(0) {}
void NamedSizeStats::add_entry(const NamedSizeEntry &entry)
{
@ -104,9 +94,7 @@ string NamedTimeStats::full_report(int indent_level)
/* 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)
: 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)
{
@ -213,9 +199,7 @@ string NamedSampleCountStats::full_report(int indent_level)
/* Mesh statistics. */
MeshStats::MeshStats()
{
}
MeshStats::MeshStats() {}
string MeshStats::full_report(int indent_level)
{
@ -227,9 +211,7 @@ string MeshStats::full_report(int indent_level)
/* Image statistics. */
ImageStats::ImageStats()
{
}
ImageStats::ImageStats() {}
string ImageStats::full_report(int indent_level)
{
@ -313,18 +295,14 @@ string RenderStats::full_report()
return result;
}
NamedTimeStats::NamedTimeStats() : total_time(0.0)
{
}
NamedTimeStats::NamedTimeStats() : total_time(0.0) {}
string UpdateTimeStats::full_report(int indent_level)
{
return times.full_report(indent_level + 1);
}
SceneUpdateStats::SceneUpdateStats()
{
}
SceneUpdateStats::SceneUpdateStats() {}
string SceneUpdateStats::full_report()
{

12
intern/cycles/scene/svm.cpp
View File

@ -22,17 +22,11 @@ CCL_NAMESPACE_BEGIN
/* 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,
Shader *shader,

8
intern/cycles/session/buffers.cpp
View File

@ -56,9 +56,7 @@ NODE_DEFINE(BufferPass)
return type;
}
BufferPass::BufferPass() : Node(get_node_type())
{
}
BufferPass::BufferPass() : Node(get_node_type()) {}
BufferPass::BufferPass(const Pass *scene_pass)
: Node(get_node_type()),
@ -262,9 +260,7 @@ bool BufferParams::modified(const BufferParams &other) const
* Render Buffers.
*/
RenderBuffers::RenderBuffers(Device *device) : buffer(device, "RenderBuffers", MEM_READ_WRITE)
{
}
RenderBuffers::RenderBuffers(Device *device) : buffer(device, "RenderBuffers", MEM_READ_WRITE) {}
RenderBuffers::~RenderBuffers()
{

4
intern/cycles/session/merge.cpp
View File

@ -563,9 +563,7 @@ static void read_layer_samples(vector<MergeImage> &images,
}
/* Image Merger */
ImageMerger::ImageMerger()
{
}
ImageMerger::ImageMerger() {}
bool ImageMerger::run()
{

4
intern/cycles/session/tile.cpp
View File

@ -319,9 +319,7 @@ TileManager::TileManager()
to_string(tile_manager_id);
}
TileManager::~TileManager()
{
}
TileManager::~TileManager() {}
int TileManager::compute_render_tile_size(const int suggested_tile_size) const
{

4
intern/cycles/session/tile.h
View File

@ -25,9 +25,7 @@ class Tile {
int window_x = 0, window_y = 0;
int window_width = 0, window_height = 0;
Tile()
{
}
Tile() {}
};
/* --------------------------------------------------------------------

4
intern/cycles/subd/dice.cpp
View File

@ -115,9 +115,7 @@ void EdgeDice::stitch_triangles(Subpatch &sub, int edge)
/* QuadDice */
QuadDice::QuadDice(const SubdParams &params_) : EdgeDice(params_)
{
}
QuadDice::QuadDice(const SubdParams &params_) : EdgeDice(params_) {}
float2 QuadDice::map_uv(Subpatch &sub, float u, float v)
{

4
intern/cycles/subd/patch.h
View File

@ -11,9 +11,7 @@ CCL_NAMESPACE_BEGIN
class Patch {
public:
Patch() : patch_index(0), shader(0), from_ngon(false)
{
}
Patch() : patch_index(0), shader(0), from_ngon(false) {}
virtual ~Patch() = default;

4
intern/cycles/subd/split.cpp
View File

@ -22,9 +22,7 @@ CCL_NAMESPACE_BEGIN
#define STITCH_NGON_CENTER_VERT_INDEX_OFFSET 0x60000000
#define STITCH_NGON_SPLIT_EDGE_CENTER_VERT_TAG (0x60000000 - 1)
DiagSplit::DiagSplit(const SubdParams &params_) : params(params_)
{
}
DiagSplit::DiagSplit(const SubdParams &params_) : params(params_) {}
float3 DiagSplit::to_world(Patch *patch, float2 uv)
{

4
intern/cycles/test/render_graph_finalize_test.cpp
View File

@ -160,9 +160,7 @@ class RenderGraph : public testing::Test {
ShaderGraph graph;
ShaderGraphBuilder builder;
RenderGraph() : testing::Test(), builder(&graph)
{
}
RenderGraph() : testing::Test(), builder(&graph) {}
virtual void SetUp()
{

4
intern/cycles/test/util_task_test.cpp
View File

@ -9,9 +9,7 @@ CCL_NAMESPACE_BEGIN
namespace {
void task_run()
{
}
void task_run() {}
} // namespace

4
intern/cycles/util/array.h
View File

@ -23,9 +23,7 @@ CCL_NAMESPACE_BEGIN
template<typename T, size_t alignment = MIN_ALIGNMENT_CPU_DATA_TYPES> class array {
public:
array() : data_(NULL), datasize_(0), capacity_(0)
{
}
array() : data_(NULL), datasize_(0), capacity_(0) {}
explicit array(size_t newsize)
{

Some files were not shown because too many files have changed in this diff Show More