[Bf-blender-cvs] [c76d4ddf0bf] tmp-workbench-rewrite2: Cleanup comments
Miguel Pozo
noreply at git.blender.org
Tue Dec 20 13:36:51 CET 2022
Commit: c76d4ddf0bf1358c0142a8212f3b0d3e567aebc2
Author: Miguel Pozo
Date: Mon Dec 19 16:27:29 2022 +0100
Branches: tmp-workbench-rewrite2
https://developer.blender.org/rBc76d4ddf0bf1358c0142a8212f3b0d3e567aebc2
Cleanup comments
===================================================================
M source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl
M source/blender/draw/engines/workbench/workbench_effect_cavity.cc
M source/blender/draw/engines/workbench/workbench_effect_dof.cc
M source/blender/draw/engines/workbench/workbench_effect_outline.cc
M source/blender/draw/engines/workbench/workbench_materials_next.cc
M source/blender/draw/engines/workbench/workbench_private.hh
M source/blender/draw/engines/workbench/workbench_resources.cc
M source/blender/draw/engines/workbench/workbench_shadow.cc
M source/blender/draw/engines/workbench/workbench_state.cc
===================================================================
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl
index e638e68c80f..aef73672a8a 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl
@@ -1,9 +1,4 @@
-/**
- * Compute visibility of each resource bounds for a given view.
- */
-/* TODO(fclem): This could be augmented by a 2 pass occlusion culling system. */
-
#pragma BLENDER_REQUIRE(common_math_lib.glsl)
#pragma BLENDER_REQUIRE(common_intersect_lib.glsl)
diff --git a/source/blender/draw/engines/workbench/workbench_effect_cavity.cc b/source/blender/draw/engines/workbench/workbench_effect_cavity.cc
index c0ee7fd60c2..a87c0fa2ba1 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_cavity.cc
+++ b/source/blender/draw/engines/workbench/workbench_effect_cavity.cc
@@ -1,5 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2020 Blender Foundation. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup draw_engine
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.cc b/source/blender/draw/engines/workbench/workbench_effect_dof.cc
index e5282166c26..25b0c6de74e 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_dof.cc
+++ b/source/blender/draw/engines/workbench/workbench_effect_dof.cc
@@ -1,5 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2016 Blender Foundation. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup draw_engine
diff --git a/source/blender/draw/engines/workbench/workbench_effect_outline.cc b/source/blender/draw/engines/workbench/workbench_effect_outline.cc
index 4a060153618..18b8b484aef 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_outline.cc
+++ b/source/blender/draw/engines/workbench/workbench_effect_outline.cc
@@ -1,5 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2020 Blender Foundation. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup draw_engine
diff --git a/source/blender/draw/engines/workbench/workbench_materials_next.cc b/source/blender/draw/engines/workbench/workbench_materials_next.cc
index 6e4085b584e..ec42c696ccc 100644
--- a/source/blender/draw/engines/workbench/workbench_materials_next.cc
+++ b/source/blender/draw/engines/workbench/workbench_materials_next.cc
@@ -4,10 +4,9 @@
#include "BLI_hash.h"
/* get_image */
+#include "BKE_node.h"
#include "DNA_node_types.h"
#include "ED_uvedit.h"
-//#include "BKE_image.h"
-#include "BKE_node.h"
/* get_image */
namespace blender::workbench {
diff --git a/source/blender/draw/engines/workbench/workbench_private.hh b/source/blender/draw/engines/workbench/workbench_private.hh
index b06666f3ad2..9173cc089c7 100644
--- a/source/blender/draw/engines/workbench/workbench_private.hh
+++ b/source/blender/draw/engines/workbench/workbench_private.hh
@@ -119,8 +119,8 @@ class CavityEffect {
bool curvature_enabled_;
bool cavity_enabled_;
- static const int max_samples_ = 512; // This value must be kept in sync with the one declared at
- // workbench_composite_info.hh (cavity_samples)
+ static const int max_samples_ = 512; /* This value must be kept in sync with the one declared at
+ * workbench_composite_info.hh (cavity_samples) */
UniformArrayBuffer<float4, max_samples_> samples_buf;
void load_samples_buf(int ssao_samples);
@@ -253,7 +253,6 @@ class ShadowPass {
UniformBuffer<ExtrudedFrustum> extruded_frustum_;
ShadowPass::PassType current_pass_type_;
- /* TODO(Miguel Pozo): Use multiple views? */
VisibilityBuf pass_visibility_buf_;
VisibilityBuf fail_visibility_buf_;
diff --git a/source/blender/draw/engines/workbench/workbench_resources.cc b/source/blender/draw/engines/workbench/workbench_resources.cc
index 035e9ba7284..556df6a5366 100644
--- a/source/blender/draw/engines/workbench/workbench_resources.cc
+++ b/source/blender/draw/engines/workbench/workbench_resources.cc
@@ -1,5 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2020 Blender Foundation. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "../eevee/eevee_lut.h" /* TODO: find somewhere to share blue noise Table. */
#include "BKE_studiolight.h"
diff --git a/source/blender/draw/engines/workbench/workbench_shadow.cc b/source/blender/draw/engines/workbench/workbench_shadow.cc
index 920f1e444e2..e82f032db8e 100644
--- a/source/blender/draw/engines/workbench/workbench_shadow.cc
+++ b/source/blender/draw/engines/workbench/workbench_shadow.cc
@@ -1,5 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2020 Blender Foundation. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup draw_engine
@@ -22,7 +21,6 @@
#include "workbench_private.hh"
#define DEBUG_SHADOW_VOLUME 0
-#define GPU_CULLING 1
namespace blender::workbench {
@@ -54,12 +52,12 @@ void ShadowPass::ShadowView::setup(View &view, float3 light_direction, bool forc
*/
/* Frustum Planes indices */
- const int x_neg = 0; // left
- const int x_pos = 5; // right
- const int y_neg = 1; // bottom
- const int y_pos = 3; // top
- const int z_pos = 4; // near
- const int z_neg = 2; // far
+ const int x_neg = 0; /* left */
+ const int x_pos = 5; /* right */
+ const int y_neg = 1; /* bottom */
+ const int y_pos = 3; /* top */
+ const int z_pos = 4; /* near */
+ const int z_neg = 2; /* far */
int3 corner_faces[8] = {{x_neg, y_neg, z_pos},
{x_neg, y_neg, z_neg},
@@ -152,11 +150,11 @@ void ShadowPass::ShadowView::setup(View &view, float3 light_direction, bool forc
lit_faces += face_lit[corner_faces[i_corner][i_face]] ? 1 : 0;
}
if (lit_faces < 3) {
- // Add original corner
+ /* Add original corner */
corners_result.append(frustum_corners.vec[i_corner]);
if (lit_faces > 0) {
- // Add extruded corner
+ /* Add extruded corner */
corners_result.append(float3(frustum_corners.vec[i_corner]) - (light_direction_ * 1e4f));
}
}
@@ -224,7 +222,7 @@ void ShadowPass::ShadowView::compute_visibility(ObjectBoundsBuf &bounds,
GPU_storagebuf_clear(fail_visibility_buf_, GPU_R32UI, GPU_DATA_UINT, &data);
}
else if (current_pass_type_ == ShadowPass::Fail) {
- // Already computed in the ShadowPass::Pass
+ /* Already computed in the ShadowPass::Pass */
return;
}
else {
diff --git a/source/blender/draw/engines/workbench/workbench_state.cc b/source/blender/draw/engines/workbench/workbench_state.cc
index 8545fcfef94..5e0699d0192 100644
--- a/source/blender/draw/engines/workbench/workbench_state.cc
+++ b/source/blender/draw/engines/workbench/workbench_state.cc
@@ -1,5 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2020 Blender Foundation. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "workbench_private.hh"
More information about the Bf-blender-cvs
mailing list