[Bf-blender-cvs] [9b867b1cf70] cycles-x: Cycles X: restore baking of more passes
Brecht Van Lommel
noreply at git.blender.org
Tue Jun 8 17:27:53 CEST 2021
Commit: 9b867b1cf707ae393f02ea6d17da3e376d8ef7da
Author: Brecht Van Lommel
Date: Fri Jun 4 18:41:35 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB9b867b1cf707ae393f02ea6d17da3e376d8ef7da
Cycles X: restore baking of more passes
The idea is to map baking settings to render passes. Still various passes
missing. In particular AO and Shadow (also missing for regular render) and
the complete filter options for light baking.
Some details of the implementation:
* The pass accessor can now read e.g. roughness into an RGBA image, which
is convenient for baking.
* ShaderEvalType is now only used for displace/background baking, no longer
part of the kernel and much smaller. Instead passes are used.
* Roughness render pass added for baking.
* Normals are baked as -1..1 just like the render pass, the Blender side
was updated since it expected 0..1 previously.
Differential Revision: https://developer.blender.org/D11534
===================================================================
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/blender_session.cpp
M intern/cycles/integrator/pass_accessor.cpp
M intern/cycles/integrator/shader_eval.cpp
M intern/cycles/integrator/shader_eval.h
M intern/cycles/kernel/integrator/integrator_init_from_bake.h
M intern/cycles/kernel/kernel_bake.h
M intern/cycles/kernel/kernel_passes.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/render/bake.cpp
M intern/cycles/render/bake.h
M intern/cycles/render/film.cpp
M intern/cycles/render/pass.cpp
M source/blender/render/intern/bake.c
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 2d59de13fc0..8c8e5792374 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1671,7 +1671,6 @@ class CYCLES_RENDER_PT_bake_influence(CyclesButtonsPanel, Panel):
col.prop(cbk, "use_pass_diffuse")
col.prop(cbk, "use_pass_glossy")
col.prop(cbk, "use_pass_transmission")
- col.prop(cbk, "use_pass_ambient_occlusion")
col.prop(cbk, "use_pass_emit")
elif cscene.bake_type in {'DIFFUSE', 'GLOSSY', 'TRANSMISSION'}:
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 8ee976fceab..0b5c171b0cb 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -273,48 +273,6 @@ void BlenderSession::free_session()
delete session;
}
-static ShaderEvalType get_shader_type(const string &pass_type)
-{
- const char *shader_type = pass_type.c_str();
-
- /* data passes */
- if (strcmp(shader_type, "NORMAL") == 0)
- return SHADER_EVAL_NORMAL;
- else if (strcmp(shader_type, "UV") == 0)
- return SHADER_EVAL_UV;
- else if (strcmp(shader_type, "ROUGHNESS") == 0)
- return SHADER_EVAL_ROUGHNESS;
- else if (strcmp(shader_type, "DIFFUSE_COLOR") == 0)
- return SHADER_EVAL_DIFFUSE_COLOR;
- else if (strcmp(shader_type, "GLOSSY_COLOR") == 0)
- return SHADER_EVAL_GLOSSY_COLOR;
- else if (strcmp(shader_type, "TRANSMISSION_COLOR") == 0)
- return SHADER_EVAL_TRANSMISSION_COLOR;
- else if (strcmp(shader_type, "EMIT") == 0)
- return SHADER_EVAL_EMISSION;
-
- /* light passes */
- else if (strcmp(shader_type, "AO") == 0)
- return SHADER_EVAL_AO;
- else if (strcmp(shader_type, "COMBINED") == 0)
- return SHADER_EVAL_COMBINED;
- else if (strcmp(shader_type, "SHADOW") == 0)
- return SHADER_EVAL_SHADOW;
- else if (strcmp(shader_type, "DIFFUSE") == 0)
- return SHADER_EVAL_DIFFUSE;
- else if (strcmp(shader_type, "GLOSSY") == 0)
- return SHADER_EVAL_GLOSSY;
- else if (strcmp(shader_type, "TRANSMISSION") == 0)
- return SHADER_EVAL_TRANSMISSION;
-
- /* extra */
- else if (strcmp(shader_type, "ENVIRONMENT") == 0)
- return SHADER_EVAL_ENVIRONMENT;
-
- else
- return SHADER_EVAL_BAKE;
-}
-
void BlenderSession::do_write_update_render_tile(bool do_update_only)
{
const int2 tile_offset = session->get_render_tile_offset();
@@ -587,48 +545,93 @@ void BlenderSession::render(BL::Depsgraph &b_depsgraph_)
session->update_render_tile_cb = function_null;
}
-static int bake_pass_filter_get(const int pass_filter)
+static PassType bake_type_to_pass(const string &bake_type_str, const int bake_filter)
{
- int flag = BAKE_FILTER_NONE;
-
- if ((pass_filter & BL::BakeSettings::pass_filter_DIRECT) != 0)
- flag |= BAKE_FILTER_DIRECT;
- if ((pass_filter & BL::BakeSettings::pass_filter_INDIRECT) != 0)
- flag |= BAKE_FILTER_INDIRECT;
- if ((pass_filter & BL::BakeSettings::pass_filter_COLOR) != 0)
- flag |= BAKE_FILTER_COLOR;
-
- if ((pass_filter & BL::BakeSettings::pass_filter_DIFFUSE) != 0)
- flag |= BAKE_FILTER_DIFFUSE;
- if ((pass_filter & BL::BakeSettings::pass_filter_GLOSSY) != 0)
- flag |= BAKE_FILTER_GLOSSY;
- if ((pass_filter & BL::BakeSettings::pass_filter_TRANSMISSION) != 0)
- flag |= BAKE_FILTER_TRANSMISSION;
-
- if ((pass_filter & BL::BakeSettings::pass_filter_EMIT) != 0)
- flag |= BAKE_FILTER_EMISSION;
-
- return flag;
+ const char *bake_type = bake_type_str.c_str();
+
+ /* data passes */
+ if (strcmp(bake_type, "NORMAL") == 0) {
+ return PASS_NORMAL;
+ }
+ else if (strcmp(bake_type, "UV") == 0) {
+ return PASS_UV;
+ }
+ else if (strcmp(bake_type, "ROUGHNESS") == 0) {
+ return PASS_ROUGHNESS;
+ }
+ else if (strcmp(bake_type, "EMIT") == 0) {
+ return PASS_EMISSION;
+ }
+ /* light passes */
+ else if (strcmp(bake_type, "AO") == 0) {
+ return PASS_AO;
+ }
+ else if (strcmp(bake_type, "COMBINED") == 0) {
+ return PASS_COMBINED;
+ }
+ else if (strcmp(bake_type, "SHADOW") == 0) {
+ return PASS_SHADOW;
+ }
+ else if (strcmp(bake_type, "DIFFUSE") == 0) {
+ /* TODO: arbitrary combinations. */
+ if (bake_filter & BL::BakeSettings::pass_filter_DIRECT) {
+ return PASS_DIFFUSE_DIRECT;
+ }
+ else if (bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
+ return PASS_DIFFUSE_INDIRECT;
+ }
+ else if (bake_filter & BL::BakeSettings::pass_filter_COLOR) {
+ return PASS_DIFFUSE_COLOR;
+ }
+ }
+ else if (strcmp(bake_type, "GLOSSY") == 0) {
+ /* TODO: arbitrary combinations. */
+ if (bake_filter & BL::BakeSettings::pass_filter_DIRECT) {
+ return PASS_GLOSSY_DIRECT;
+ }
+ else if (bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
+ return PASS_GLOSSY_INDIRECT;
+ }
+ else if (bake_filter & BL::BakeSettings::pass_filter_COLOR) {
+ return PASS_GLOSSY_COLOR;
+ }
+ }
+ else if (strcmp(bake_type, "TRANSMISSION") == 0) {
+ /* TODO: arbitrary combinations. */
+ if (bake_filter & BL::BakeSettings::pass_filter_DIRECT) {
+ return PASS_TRANSMISSION_DIRECT;
+ }
+ else if (bake_filter & BL::BakeSettings::pass_filter_INDIRECT) {
+ return PASS_TRANSMISSION_INDIRECT;
+ }
+ else if (bake_filter & BL::BakeSettings::pass_filter_COLOR) {
+ return PASS_TRANSMISSION_COLOR;
+ }
+ }
+ /* extra */
+ else if (strcmp(bake_type, "ENVIRONMENT") == 0) {
+ return PASS_BACKGROUND;
+ }
+
+ return PASS_COMBINED;
}
void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
BL::Object &b_object,
- const string &pass_type,
- const int pass_filter,
+ const string &bake_type,
+ const int bake_filter,
const int bake_width,
const int bake_height)
{
b_depsgraph = b_depsgraph_;
- ShaderEvalType shader_type = get_shader_type(pass_type);
- int bake_pass_filter = bake_pass_filter_get(pass_filter);
-
/* Initialize bake manager, before we load the baking kernels. */
- scene->bake_manager->set(scene, b_object.name(), shader_type, bake_pass_filter);
+ scene->bake_manager->set(scene, b_object.name());
- /* Passes are identified by name, so in order to return the combined pass we need to set the
- * name. */
- Pass::add(PASS_COMBINED, scene->passes, "Combined");
+ /* Add render pass that we want to bake, and name it Combined so that it is
+ * used as that on the Blender side. */
+ const PassType pass_type = bake_type_to_pass(bake_type, bake_filter);
+ Pass::add(pass_type, scene->passes, "Combined");
session->read_render_tile_cb = [&]() { read_render_tile(); };
session->write_render_tile_cb = [&]() { write_render_tile(); };
@@ -904,9 +907,9 @@ void BlenderSession::update_status_progress()
}
double current_time = time_dt();
- /* When rendering in a window, redraw the status at least once per second to keep the elapsed and
- * remaining time up-to-date. For headless rendering, only report when something significant
- * changes to keep the console output readable. */
+ /* When rendering in a window, redraw the status at least once per second to keep the elapsed
+ * and remaining time up-to-date. For headless rendering, only report when something
+ * significant changes to keep the console output readable. */
if (status != last_status || (!headless && (current_time - last_status_time) > 1.0)) {
b_engine.update_stats("", (timestatus + scene_status + status).c_str());
b_engine.update_memory_stats(mem_used, mem_peak);
diff --git a/intern/cycles/integrator/pass_accessor.cpp b/intern/cycles/integrator/pass_accessor.cpp
index 5b75cb42660..5efe539ac4d 100644
--- a/intern/cycles/integrator/pass_accessor.cpp
+++ b/intern/cycles/integrator/pass_accessor.cpp
@@ -99,6 +99,49 @@ bool PassAccessor::get_render_tile_pixels(const RenderBuffers *render_buffers,
return get_render_tile_pixels(render_buffers, render_buffers->params, destination);
}
+static void pad_pixels(const BufferParams &buffer_params,
+ const PassAccessor::Destination &destination,
+ const int src_num_components)
+{
+ /* When requesting a single channel pass as RGBA, or RGB pass as RGBA,
+ * fill in the additional components for convenience. */
+ const int dest_num_components = destination.num_components;
+
+ if (src_num_components >= dest_num_components) {
+ return;
+ }
+
+ const size_t size = buffer_params.width * buffer_params.height;
+ if (destination.pixels) {
+ float *pixel = destination.pixels;
+
+ for (size_t i = 0; i < size; i++, pixel += dest_num_components) {
+ if (dest_num_components >= 3 && src_num_components == 1) {
+ pixel[1] = pixel[0];
+ pixel[2] = pixel[0];
+ }
+ if (dest_num_components >= 4) {
+ pixel[3] = 1.0f;
+ }
+ }
+ }
+
+ if (destination.pixels_half_rgba) {
+ const float one = float_to_half(1.0f);
+ half4 *pixel = destination.pixels_half_rgba;
+
+ for (size_t i = 0; i < size; i++, pixel++) {
+ if (dest_num_components >= 3 && src_num_components == 1) {
+ pixel[0].y = pixel[0].x;
+ pixel[0].z = pixel[0].x;
+ }
+ if (dest_num_components >= 4) {
+ pixel[0].w = one;
+ }
+ }
+ }
+}
+
bool PassAccessor::get_render_tile_pixels(const RenderBuffers *render_buffers,
const BufferParams &buffer_params,
const Destination &destination) const
@@ -111,7 +154,7 @@ bool PassAccessor::get_render_tile_pixels(const RenderBuffers *render_buffers,
const PassInfo pass_info = Pass::get_info(type);
if (destination.num_components == 1) {
- DCHECK_EQ(pass_info.num_components, destination.num_components)
+ DCHECK_LE(pass_info.num_components, destination.num_components)
<< "Number of components mismatch for pass type " << pass_info.type;
/* Scalar */
@@ -133,11 +176,11 @@ bool PassAccessor::get_render_tile_pixels(const RenderBuffers *render_buffers,
}
else if
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list