[Bf-blender-cvs] [cda2dc721dc] master: Cleanup: compiler warnings
Campbell Barton
noreply at git.blender.org
Fri Sep 23 06:35:29 CEST 2022
Commit: cda2dc721dce9db9ea94b059ccd1cc7a3ae73aa6
Author: Campbell Barton
Date: Fri Sep 23 14:33:41 2022 +1000
Branches: master
https://developer.blender.org/rBcda2dc721dce9db9ea94b059ccd1cc7a3ae73aa6
Cleanup: compiler warnings
===================================================================
M source/blender/draw/intern/draw_manager_shader.c
M source/blender/gpu/opengl/gl_backend.hh
===================================================================
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index 6f8df54ead3..f452cd47cb7 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -118,7 +118,7 @@ static void drw_deferred_shader_compilation_exec(
BLI_spin_lock(&comp->list_lock);
/* Pop tail because it will be less likely to lock the main thread
* if all GPUMaterials are to be freed (see DRW_deferred_shader_remove()). */
- LinkData *link = (LinkData *)BLI_poptail(&comp->optimize_queue);
+ link = (LinkData *)BLI_poptail(&comp->optimize_queue);
GPUMaterial *optimize_mat = link ? (GPUMaterial *)link->data : NULL;
if (optimize_mat) {
/* Avoid another thread freeing the material during optimization. */
diff --git a/source/blender/gpu/opengl/gl_backend.hh b/source/blender/gpu/opengl/gl_backend.hh
index 14fca9f061d..39a4dd80279 100644
--- a/source/blender/gpu/opengl/gl_backend.hh
+++ b/source/blender/gpu/opengl/gl_backend.hh
@@ -61,7 +61,7 @@ class GLBackend : public GPUBackend {
GLTexture::samplers_update();
};
- Context *context_alloc(void *ghost_window, void *ghost_context) override
+ Context *context_alloc(void *ghost_window, void * /*ghost_context*/) override
{
return new GLContext(ghost_window, shared_orphan_list_);
};
More information about the Bf-blender-cvs
mailing list