[Bf-blender-cvs] [79ba1a1ac82] master: Cleanup: Compiler warnings in new sculpt & workbench
Hans Goudey
noreply at git.blender.org
Mon Jan 23 21:58:44 CET 2023
Commit: 79ba1a1ac82d854d840e98141b2458e4c7e2a7dd
Author: Hans Goudey
Date: Mon Jan 23 14:57:26 2023 -0600
Branches: master
https://developer.blender.org/rB79ba1a1ac82d854d840e98141b2458e4c7e2a7dd
Cleanup: Compiler warnings in new sculpt & workbench
Set but unused variables, unused arguments, unnecessary/incorrect type
casting, missing static qualifier. Unused arguments are removed.
===================================================================
M source/blender/blenkernel/intern/pbvh_pixels.cc
M source/blender/draw/engines/basic/basic_engine.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/workbench/workbench_effect_outline.cc
M source/blender/draw/engines/workbench/workbench_engine.cc
M source/blender/draw/engines/workbench/workbench_mesh_passes.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/editors/sculpt_paint/sculpt_intern.h
M source/blender/editors/sculpt_paint/sculpt_paint_color.c
M source/blender/editors/sculpt_paint/sculpt_paint_image.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index ed87631ffe9..0055cf1335f 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -99,12 +99,8 @@ struct SplitNodePair {
static void split_thread_job(TaskPool *__restrict pool, void *taskdata);
-static void split_pixel_node(PBVH *pbvh,
- SplitNodePair *split,
- Mesh *mesh,
- Image *image,
- ImageUser *image_user,
- SplitQueueData *tdata)
+static void split_pixel_node(
+ PBVH *pbvh, SplitNodePair *split, Image *image, ImageUser *image_user, SplitQueueData *tdata)
{
BB cb;
PBVHNode *node = &split->node;
@@ -304,7 +300,7 @@ static void split_thread_job(TaskPool *__restrict pool, void *taskdata)
SplitQueueData *tdata = static_cast<SplitQueueData *>(BLI_task_pool_user_data(pool));
SplitNodePair *split = static_cast<SplitNodePair *>(taskdata);
- split_pixel_node(tdata->pbvh, split, tdata->mesh, tdata->image, tdata->image_user, tdata);
+ split_pixel_node(tdata->pbvh, split, tdata->image, tdata->image_user, tdata);
}
static void split_pixel_nodes(PBVH *pbvh, Mesh *mesh, Image *image, ImageUser *image_user)
diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index 5ff596ca083..e8c2dc259fc 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -225,11 +225,7 @@ static void basic_cache_populate(void *vedata, Object *ob)
if (G.debug_value == 889 && ob->sculpt && ob->sculpt->pbvh) {
int debug_node_nr = 0;
DRW_debug_modelmat(ob->object_to_world);
- BKE_pbvh_draw_debug_cb(
- ob->sculpt->pbvh,
- (void (*)(void *d, const float min[3], const float max[3], PBVHNodeFlags f))
- DRW_sculpt_debug_cb,
- &debug_node_nr);
+ BKE_pbvh_draw_debug_cb(ob->sculpt->pbvh, DRW_sculpt_debug_cb, &debug_node_nr);
}
}
}
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index c90ae397e57..e5645ac4a96 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -888,11 +888,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata,
if (G.debug_value == 889 && ob->sculpt && ob->sculpt->pbvh) {
int debug_node_nr = 0;
DRW_debug_modelmat(ob->object_to_world);
- BKE_pbvh_draw_debug_cb(
- ob->sculpt->pbvh,
- (void (*)(void *d, const float min[3], const float max[3], PBVHNodeFlags f))
- DRW_sculpt_debug_cb,
- &debug_node_nr);
+ BKE_pbvh_draw_debug_cb(ob->sculpt->pbvh, DRW_sculpt_debug_cb, &debug_node_nr);
}
}
diff --git a/source/blender/draw/engines/workbench/workbench_effect_outline.cc b/source/blender/draw/engines/workbench/workbench_effect_outline.cc
index 18b8b484aef..a1826d5ecf8 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_outline.cc
+++ b/source/blender/draw/engines/workbench/workbench_effect_outline.cc
@@ -38,7 +38,7 @@ void OutlinePass::sync(SceneResources &resources)
ps_.draw_procedural(GPU_PRIM_TRIS, 1, 3);
}
-void OutlinePass::draw(Manager &manager, View &view, SceneResources &resources, int2 resolution)
+void OutlinePass::draw(Manager &manager, SceneResources &resources)
{
if (!enabled_) {
return;
diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc
index a04f61418f6..d2743d5733b 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.cc
+++ b/source/blender/draw/engines/workbench/workbench_engine.cc
@@ -272,7 +272,7 @@ class Instance {
}
if (object_state.draw_shadow) {
- shadow_ps.object_sync(manager, scene_state, ob_ref, handle, has_transparent_material);
+ shadow_ps.object_sync(scene_state, ob_ref, handle, has_transparent_material);
}
}
@@ -363,11 +363,11 @@ class Instance {
&shadow_ps,
transparent_ps.accumulation_ps_.is_empty());
transparent_ps.draw(manager, view, resources, resolution);
- transparent_depth_ps.draw(manager, view, resources, resolution);
+ transparent_depth_ps.draw(manager, view, resources);
// volume_ps.draw_prepass(manager, view, resources.depth_tx);
- outline_ps.draw(manager, view, resources, resolution);
+ outline_ps.draw(manager, resources);
dof_ps.draw(manager, view, resources, resolution);
anti_aliasing_ps.draw(manager, view, resources, resolution, depth_tx, color_tx);
diff --git a/source/blender/draw/engines/workbench/workbench_mesh_passes.cc b/source/blender/draw/engines/workbench/workbench_mesh_passes.cc
index bc90f26b33d..a32127d66b0 100644
--- a/source/blender/draw/engines/workbench/workbench_mesh_passes.cc
+++ b/source/blender/draw/engines/workbench/workbench_mesh_passes.cc
@@ -216,12 +216,8 @@ void OpaquePass::draw(Manager &manager,
}
if (shadow_pass) {
- shadow_pass->draw(manager,
- view,
- resources,
- resolution,
- *deferred_ps_stencil_tx,
- !gbuffer_in_front_ps_.is_empty());
+ shadow_pass->draw(
+ manager, view, resources, *deferred_ps_stencil_tx, !gbuffer_in_front_ps_.is_empty());
}
opaque_fb.ensure(GPU_ATTACHMENT_NONE, GPU_ATTACHMENT_TEXTURE(resources.color_tx));
@@ -359,10 +355,7 @@ void TransparentDepthPass::sync(const SceneState &scene_state, SceneResources &r
ePipelineType::OPAQUE, eLightingType::FLAT, clip, resources.shader_cache);
}
-void TransparentDepthPass::draw(Manager &manager,
- View &view,
- SceneResources &resources,
- int2 resolution)
+void TransparentDepthPass::draw(Manager &manager, View &view, SceneResources &resources)
{
if (is_empty()) {
return;
diff --git a/source/blender/draw/engines/workbench/workbench_private.hh b/source/blender/draw/engines/workbench/workbench_private.hh
index 086553ca5c1..94b609519d6 100644
--- a/source/blender/draw/engines/workbench/workbench_private.hh
+++ b/source/blender/draw/engines/workbench/workbench_private.hh
@@ -244,7 +244,7 @@ class TransparentDepthPass {
Framebuffer merge_fb = {"TransparentDepth.Merge"};
void sync(const SceneState &scene_state, SceneResources &resources);
- void draw(Manager &manager, View &view, SceneResources &resources, int2 resolution);
+ void draw(Manager &manager, View &view, SceneResources &resources);
bool is_empty() const;
};
@@ -269,7 +269,7 @@ class ShadowPass {
ShadowView();
protected:
- virtual void compute_visibility(ObjectBoundsBuf &bounds, uint resource_len, bool debug_freeze);
+ virtual void compute_visibility(ObjectBoundsBuf &bounds, uint resource_len);
virtual VisibilityBuf &get_visibility_buffer();
} view_ = {};
@@ -299,15 +299,13 @@ class ShadowPass {
void init(const SceneState &scene_state, SceneResources &resources);
void update();
void sync();
- void object_sync(Manager &manager,
- SceneState &scene_state,
+ void object_sync(SceneState &scene_state,
ObjectRef &ob_ref,
ResourceHandle handle,
const bool has_transp_mat);
void draw(Manager &manager,
View &view,
SceneResources &resources,
- int2 resolution,
GPUTexture &depth_stencil_tx,
/* Needed when there are opaque "In Front" objects in the scene */
bool force_fail_method);
@@ -324,7 +322,7 @@ class OutlinePass {
public:
void init(const SceneState &scene_state);
void sync(SceneResources &resources);
- void draw(Manager &manager, View &view, SceneResources &resources, int2 resolution);
+ void draw(Manager &manager, SceneResources &resources);
};
class DofPass {
diff --git a/source/blender/draw/engines/workbench/workbench_resources.cc b/source/blender/draw/engines/workbench/workbench_resources.cc
index 98d3ca8f668..d33b57b943e 100644
--- a/source/blender/draw/engines/workbench/workbench_resources.cc
+++ b/source/blender/draw/engines/workbench/workbench_resources.cc
@@ -8,7 +8,7 @@
namespace blender::workbench {
-bool get_matcap_tx(Texture &matcap_tx, const StudioLight &studio_light)
+static bool get_matcap_tx(Texture &matcap_tx, const StudioLight &studio_light)
{
ImBuf *matcap_diffuse = studio_light.matcap_diffuse.ibuf;
ImBuf *matcap_specular = studio_light.matcap_specular.ibuf;
@@ -36,7 +36,7 @@ bool get_matcap_tx(Texture &matcap_tx, const StudioLight &studio_light)
return false;
}
-float4x4 get_world_shading_rotation_matrix(float studiolight_rot_z)
+static float4x4 get_world_shading_rotation_matrix(float studiolight_rot_z)
{
/* TODO(Miguel Pozo) C++ API ? */
float V[4][4], R[4][4];
@@ -48,8 +48,8 @@ float4x4 get_world_shading_rotation_matrix(float studiolight_rot_z)
return float4x4(R);
}
-LightData get_light_data_from_studio_solidlight(const SolidLight *sl,
- float4x4 world_shading_rotation)
+static LightData get_light_data_from_studio_solidlight(const SolidLight *sl,
+ float4x4 world_shading_rotation)
{
LightData light = {};
if (sl && sl->flag) {
diff --git a/source/blender/draw/engines/workbench/workbench_shadow.cc b/source/blender/draw/engines/workbench/workbench_shadow.cc
index 22c7b663220..533e32662a4 100644
--- a/source/blender/draw/engines/workbench/workbench_shadow.cc
+++ b/source/blender/draw/engines/workbench/workbench_shadow.cc
@@ -131,11 +131,9 @@ void ShadowPass::ShadowView::setup(View &view, float3 light_direction, bool forc
float4 extruded_face = float4(UNPACK3(normal), math::dot(normal, corner_a));
/* Ensure the plane faces outwards */
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list