[Bf-blender-cvs] [e0ad4712f6a] master: Cleanup: quiet warnings, format

[Campbell Barton]

Commit: e0ad4712f6aadf42fe56c58311c542f0edad3e9a
Author: Campbell Barton
Date:   Mon Oct 10 11:17:10 2022 +1100
Branches: master
https://developer.blender.org/rBe0ad4712f6aadf42fe56c58311c542f0edad3e9a

Cleanup: quiet warnings, format

===================================================================

M	source/blender/draw/intern/draw_manager.c
M	source/blender/draw/intern/draw_manager.h
M	source/blender/draw/intern/draw_manager_data.cc
M	source/blender/draw/intern/draw_manager_shader.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 28abbc6ab71..da77845feb4 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -422,7 +422,8 @@ static void draw_prune_vlattrs(DRWData *drw_data)
   /* Forget known attributes after they are unused for a few frames. */
   LISTBASE_FOREACH_MUTABLE (GPULayerAttr *, attr, &drw_data->vlattrs_name_list) {
     if (++attr->users > 10) {
-      BLI_ghash_remove(drw_data->vlattrs_name_cache, (void *)attr->hash_code, NULL, NULL);
+      BLI_ghash_remove(
+          drw_data->vlattrs_name_cache, POINTER_FROM_UINT(attr->hash_code), NULL, NULL);
       BLI_freelinkN(&drw_data->vlattrs_name_list, attr);
     }
   }
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index ce316a31cf9..52129049269 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -697,7 +697,7 @@ void drw_uniform_attrs_pool_update(struct GHash *table,
                                    struct Object *dupli_parent,
                                    struct DupliObject *dupli_source);
 
-GPUUniformBuf *drw_ensure_layer_attribute_buffer();
+GPUUniformBuf *drw_ensure_layer_attribute_buffer(void);
 
 double *drw_engine_data_cache_time_get(GPUViewport *viewport);
 void *drw_engine_data_engine_data_create(GPUViewport *viewport, void *engine_type);
diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc
index 030b13177f1..7d55a11a00f 100644
--- a/source/blender/draw/intern/draw_manager_data.cc
+++ b/source/blender/draw/intern/draw_manager_data.cc
@@ -695,7 +695,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
   drw_call_calc_orco(ob, ob_infos->orcotexfac);
   /* Random float value. */
   uint random = (DST.dupli_source) ?
-                    DST.dupli_source->random_id :
+                     DST.dupli_source->random_id :
                      /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
                       * put it in ob->runtime and make depsgraph ensure it is up to date. */
                      BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index 8b287e116bc..40b05dff51f 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -252,7 +252,7 @@ static void drw_register_shader_vlattrs(GPUMaterial *mat)
     GPULayerAttr **p_val;
 
     /* Add to the table and list if newly seen. */
-    if (!BLI_ghash_ensure_p(hash, (void *)attr->hash_code, (void ***)&p_val)) {
+    if (!BLI_ghash_ensure_p(hash, POINTER_FROM_UINT(attr->hash_code), (void ***)&p_val)) {
       DST.vmempool->vlattrs_ubo_ready = false;
 
       GPULayerAttr *new_link = *p_val = MEM_dupallocN(attr);