blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: compiler warnings

This commit is contained in:
Brecht Van Lommel 2020-06-24 17:08:01 +02:00
parent c78b831e69
commit b4e1571d0b
8 changed files with 27 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/blender/blender_camera.cpp
View File

@ -867,8 +867,7 @@ void BlenderSync::sync_view(BL::SpaceView3D &b_v3d,
}
}
BufferParams BlenderSync::get_buffer_params(BL::Scene &b_scene,
BL::RenderSettings &b_render,
BufferParams BlenderSync::get_buffer_params(BL::RenderSettings &b_render,
BL::SpaceView3D &b_v3d,
BL::RegionView3D &b_rv3d,
Camera *cam,

53
intern/cycles/blender/blender_session.cpp
View File

@ -157,14 +157,8 @@ void BlenderSession::create_session()
}
/* set buffer parameters */
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene,
b_render,
b_v3d,
b_rv3d,
scene->camera,
width,
height,
session_params.denoising.use);
BufferParams buffer_params = BlenderSync::get_buffer_params(
b_render, b_v3d, b_rv3d, scene->camera, width, height, session_params.denoising.use);
session->reset(buffer_params, session_params.samples);
b_engine.use_highlight_tiles(session_params.progressive_refine == false);
@ -245,8 +239,7 @@ void BlenderSession::reset_session(BL::BlendData &b_data, BL::Depsgraph &b_depsg
BL::SpaceView3D b_null_space_view3d(PointerRNA_NULL);
BL::RegionView3D b_null_region_view3d(PointerRNA_NULL);
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene,
b_render,
BufferParams buffer_params = BlenderSync::get_buffer_params(b_render,
b_null_space_view3d,
b_null_region_view3d,
scene->camera,
@ -485,14 +478,8 @@ void BlenderSession::render(BL::Depsgraph &b_depsgraph_)
/* get buffer parameters */
SessionParams session_params = BlenderSync::get_session_params(
b_engine, b_userpref, b_scene, background, b_view_layer);
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene,
b_render,
b_v3d,
b_rv3d,
scene->camera,
width,
height,
session_params.denoising.use);
BufferParams buffer_params = BlenderSync::get_buffer_params(
b_render, b_v3d, b_rv3d, scene->camera, width, height, session_params.denoising.use);
/* temporary render result to find needed passes and views */
BL::RenderResult b_rr = begin_render_result(
@ -838,14 +825,8 @@ void BlenderSession::synchronize(BL::Depsgraph &b_depsgraph_)
sync->sync_camera(b_render, b_camera_override, width, height, "");
/* get buffer parameters */
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene,
b_render,
b_v3d,
b_rv3d,
scene->camera,
width,
height,
session_params.denoising.use);
BufferParams buffer_params = BlenderSync::get_buffer_params(
b_render, b_v3d, b_rv3d, scene->camera, width, height, session_params.denoising.use);
if (!buffer_params.denoising_data_pass) {
session_params.denoising.use = false;
@ -926,14 +907,8 @@ bool BlenderSession::draw(int w, int h)
if (reset) {
SessionParams session_params = BlenderSync::get_session_params(
b_engine, b_userpref, b_scene, background);
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene,
b_render,
b_v3d,
b_rv3d,
scene->camera,
width,
height,
session_params.denoising.use);
BufferParams buffer_params = BlenderSync::get_buffer_params(
b_render, b_v3d, b_rv3d, scene->camera, width, height, session_params.denoising.use);
bool session_pause = BlenderSync::get_session_pause(b_scene, background);
if (session_pause == false) {
@ -950,14 +925,8 @@ bool BlenderSession::draw(int w, int h)
update_status_progress();
/* draw */
BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene,
b_render,
b_v3d,
b_rv3d,
scene->camera,
width,
height,
session->params.denoising.use);
BufferParams buffer_params = BlenderSync::get_buffer_params(
b_render, b_v3d, b_rv3d, scene->camera, width, height, session->params.denoising.use);
DeviceDrawParams draw_params;
if (session->params.display_buffer_linear) {

3
intern/cycles/blender/blender_sync.h
View File

@ -102,8 +102,7 @@ class BlenderSync {
bool background,
BL::ViewLayer b_view_layer = BL::ViewLayer(PointerRNA_NULL));
static bool get_session_pause(BL::Scene &b_scene, bool background);
static BufferParams get_buffer_params(BL::Scene &b_scene,
BL::RenderSettings &b_render,
static BufferParams get_buffer_params(BL::RenderSettings &b_render,
BL::SpaceView3D &b_v3d,
BL::RegionView3D &b_rv3d,
Camera *cam,

2
intern/cycles/device/device_denoising.cpp
View File

@ -57,7 +57,7 @@ DenoisingTask::DenoisingTask(Device *device, const DeviceTask &task)
}
do_prefilter = task.denoising.store_passes && task.denoising.type == DENOISER_NLM;
do_filter = task.denoising_do_filter && task.denoising.type == DENOISER_NLM;
do_filter = task.denoising.use && task.denoising.type == DENOISER_NLM;
}
DenoisingTask::~DenoisingTask()

6
intern/cycles/device/device_optix.cpp
View File

@ -1445,21 +1445,21 @@ class OptiXDevice : public CUDADevice {
KernelData *const data = (KernelData *)host;
*(OptixTraversableHandle *)&data->bvh.scene = tlas_handle;
update_launch_params(name, offsetof(KernelParams, data), host, size);
update_launch_params(offsetof(KernelParams, data), host, size);
return;
}
// Update data storage pointers in launch parameters
# define KERNEL_TEX(data_type, tex_name) \
if (strcmp(name, #tex_name) == 0) { \
update_launch_params(name, offsetof(KernelParams, tex_name), host, size); \
update_launch_params(offsetof(KernelParams, tex_name), host, size); \
return; \
}
# include "kernel/kernel_textures.h"
# undef KERNEL_TEX
}
void update_launch_params(const char *name, size_t offset, void *data, size_t data_size)
void update_launch_params(size_t offset, void *data, size_t data_size)
{
const CUDAContextScope scope(cuContext);

3
intern/cycles/device/device_task.h
View File

@ -158,9 +158,6 @@ class DeviceTask {
bool denoising_from_render;
vector<int> denoising_frames;
bool denoising_do_filter;
bool denoising_do_prefilter;
int pass_stride;
int frame_stride;
int target_pass_stride;

10
intern/cycles/kernel/kernels/cpu/kernel.cpp
View File

@ -64,12 +64,14 @@ CCL_NAMESPACE_BEGIN
/* Memory Copy */
void kernel_const_copy(KernelGlobals *kg, const char *name, void *host, size_t size)
void kernel_const_copy(KernelGlobals *kg, const char *name, void *host, size_t)
{
if (strcmp(name, "__data") == 0)
memcpy(&kg->__data, host, size);
else
if (strcmp(name, "__data") == 0) {
kg->__data = *(KernelData *)host;
}
else {
assert(0);
}
}
void kernel_global_memory_copy(KernelGlobals *kg, const char *name, void *mem, size_t size)

4
intern/cycles/render/object.cpp
View File

@ -605,6 +605,10 @@ void ObjectManager::device_update_transforms(DeviceScene *dscene, Scene *scene,
}
});
if (progress.get_cancel()) {
return;
}
dscene->objects.copy_to_device();
if (state.need_motion == Scene::MOTION_PASS) {
dscene->object_motion_pass.copy_to_device();