blender
/
blender
136
405
Fork 587
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: suppress '-Warray-bounds' warnings 

Changes to overlay_shader.cc workaround a bug in GCC-12.2
(likely a duplicate of [0]). As the workaround involved removing
a local variable which most functions already didn't assign,
remove it for all functions.

An alternative is to add (otherwise redundant) parenthesis, e.g.
`&(e_data.sh_data[sh_cfg])`, but this would need to be noted in
code-comments, so opt for removing the intermediate variable.

[0]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106247
This commit is contained in:
Campbell Barton 2023-01-16 09:55:41 +11:00
parent 87bb14ab5f
commit e1aef2e87e
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenlib/tests/BLI_linear_allocator_test.cc
View File

@ -58,9 +58,16 @@ TEST(linear_allocator, CopyString)
blender::AlignedBuffer<256, 1> buffer;
allocator.provide_buffer(buffer);
/* False positive warning with GCC 12.2,
* considers assignment outside of array bounds (`char [0]`). */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
StringRefNull ref1 = allocator.copy_string("Hello");
StringRefNull ref2 = allocator.copy_string("World");
#pragma GCC diagnostic pop
EXPECT_EQ(ref1, "Hello");
EXPECT_EQ(ref2, "World");
EXPECT_EQ(ref2.data() - ref1.data(), 6);

35
source/blender/draw/engines/overlay/overlay_shader.cc
View File

@ -705,11 +705,11 @@ GPUShader *OVERLAY_shader_outline_detect(void)
GPUShader *OVERLAY_shader_paint_face(void)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
eGPUShaderConfig sh_cfg = draw_ctx->sh_cfg;
OVERLAY_Shaders *sh_data = &e_data.sh_data[sh_cfg];
OVERLAY_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
if (!sh_data->paint_face) {
sh_data->paint_face = GPU_shader_create_from_info_name(
sh_cfg == GPU_SHADER_CFG_CLIPPED ? "overlay_paint_face_clipped" : "overlay_paint_face");
draw_ctx->sh_cfg == GPU_SHADER_CFG_CLIPPED ? "overlay_paint_face_clipped" :
"overlay_paint_face");
}
return sh_data->paint_face;
}
@ -717,11 +717,11 @@ GPUShader *OVERLAY_shader_paint_face(void)
GPUShader *OVERLAY_shader_paint_point(void)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
eGPUShaderConfig sh_cfg = draw_ctx->sh_cfg;
OVERLAY_Shaders *sh_data = &e_data.sh_data[sh_cfg];
OVERLAY_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
if (!sh_data->paint_point) {
sh_data->paint_point = GPU_shader_create_from_info_name(
sh_cfg == GPU_SHADER_CFG_CLIPPED ? "overlay_paint_point_clipped" : "overlay_paint_point");
draw_ctx->sh_cfg == GPU_SHADER_CFG_CLIPPED ? "overlay_paint_point_clipped" :
"overlay_paint_point");
}
return sh_data->paint_point;
}
@ -729,11 +729,10 @@ GPUShader *OVERLAY_shader_paint_point(void)
GPUShader *OVERLAY_shader_paint_texture(void)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
eGPUShaderConfig sh_cfg = draw_ctx->sh_cfg;
OVERLAY_Shaders *sh_data = &e_data.sh_data[sh_cfg];
OVERLAY_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
if (!sh_data->paint_texture) {
sh_data->paint_texture = GPU_shader_create_from_info_name(
sh_cfg ? "overlay_paint_texture_clipped" : "overlay_paint_texture");
draw_ctx->sh_cfg ? "overlay_paint_texture_clipped" : "overlay_paint_texture");
}
return sh_data->paint_texture;
}
@ -741,11 +740,10 @@ GPUShader *OVERLAY_shader_paint_texture(void)
GPUShader *OVERLAY_shader_paint_vertcol(void)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
eGPUShaderConfig sh_cfg = draw_ctx->sh_cfg;
OVERLAY_Shaders *sh_data = &e_data.sh_data[sh_cfg];
OVERLAY_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
if (!sh_data->paint_vertcol) {
sh_data->paint_vertcol = GPU_shader_create_from_info_name(
sh_cfg ? "overlay_paint_vertcol_clipped" : "overlay_paint_vertcol");
draw_ctx->sh_cfg ? "overlay_paint_vertcol_clipped" : "overlay_paint_vertcol");
}
return sh_data->paint_vertcol;
}
@ -758,10 +756,10 @@ GPUShader *OVERLAY_shader_paint_weight(const bool shading)
};
int index = shading ? 1 : 0;
const DRWContextState *draw_ctx = DRW_context_state_get();
eGPUShaderConfig sh_cfg = draw_ctx->sh_cfg;
OVERLAY_Shaders *sh_data = &e_data.sh_data[sh_cfg];
OVERLAY_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
if (!sh_data->paint_weight[index]) {
sh_data->paint_weight[index] = GPU_shader_create_from_info_name(info_name[sh_cfg][index]);
sh_data->paint_weight[index] = GPU_shader_create_from_info_name(
info_name[draw_ctx->sh_cfg][index]);
}
return sh_data->paint_weight[index];
}
@ -769,11 +767,10 @@ GPUShader *OVERLAY_shader_paint_weight(const bool shading)
GPUShader *OVERLAY_shader_paint_wire(void)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
eGPUShaderConfig sh_cfg = draw_ctx->sh_cfg;
OVERLAY_Shaders *sh_data = &e_data.sh_data[sh_cfg];
OVERLAY_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
if (!sh_data->paint_wire) {
sh_data->paint_wire = GPU_shader_create_from_info_name(sh_cfg ? "overlay_paint_wire_clipped" :
"overlay_paint_wire");
sh_data->paint_wire = GPU_shader_create_from_info_name(
draw_ctx->sh_cfg ? "overlay_paint_wire_clipped" : "overlay_paint_wire");
}
return sh_data->paint_wire;
}