bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: add size suffix to IMA_MAX_RENDER_TEXT

Browse Source 
This read like a flag, when it's a string buffer size.
This commit is contained in:
Campbell Barton 2023-06-27 14:51:03 +10:00
parent 9c105065ee
commit 3c6239969e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/intern/draw_view_data.h
View File

@ -11,7 +11,7 @@
#pragma once
#define GPU_INFO_SIZE 512 /* IMA_MAX_RENDER_TEXT */
#define GPU_INFO_SIZE 512 /* IMA_MAX_RENDER_TEXT_SIZE */
#ifdef __cplusplus
extern "C" {

8
source/blender/editors/render/render_internal.cc
View File

@ -407,7 +407,7 @@ static void make_renderinfo_string(const RenderStats *rs,
const Scene *scene,
const bool v3d_override,
const char *error,
char ret[IMA_MAX_RENDER_TEXT])
char ret[IMA_MAX_RENDER_TEXT_SIZE])
{
const char *info_space = " ";
const char *info_sep = "| ";
@ -514,13 +514,13 @@ static void make_renderinfo_string(const RenderStats *rs,
}
if (G.debug & G_DEBUG) {
if (BLI_string_len_array(ret_array, i) >= IMA_MAX_RENDER_TEXT) {
if (BLI_string_len_array(ret_array, i) >= IMA_MAX_RENDER_TEXT_SIZE) {
printf("WARNING! renderwin text beyond limit\n");
}
}
BLI_assert(i < int(BOUNDED_ARRAY_TYPE_SIZE<decltype(ret_array)>()));
BLI_string_join_array(ret, IMA_MAX_RENDER_TEXT, ret_array, i);
BLI_string_join_array(ret, IMA_MAX_RENDER_TEXT_SIZE, ret_array, i);
}
static void image_renderinfo_cb(void *rjv, RenderStats *rs)
@ -533,7 +533,7 @@ static void image_renderinfo_cb(void *rjv, RenderStats *rs)
if (rr) {
/* malloc OK here, stats_draw is not in tile threads */
if (rr->text == nullptr) {
rr->text = static_cast<char *>(MEM_callocN(IMA_MAX_RENDER_TEXT, "rendertext"));
rr->text = static_cast<char *>(MEM_callocN(IMA_MAX_RENDER_TEXT_SIZE, "rendertext"));
}
make_renderinfo_string(rs, rj->scene, rj->v3d_override, rr->error, rr->text);

4
source/blender/makesdna/DNA_image_types.h
View File

@ -273,8 +273,8 @@ enum {
IMA_GENTYPE_GRID_COLOR = 2,
};
/* render */
#define IMA_MAX_RENDER_TEXT (1 << 9)
/** Size of allocated string #RenderResult::text. */
#define IMA_MAX_RENDER_TEXT_SIZE 512
/** #Image.gen_flag */
enum {

2
source/blender/render/RE_engine.h
View File

@ -138,7 +138,7 @@ typedef struct RenderEngine {
struct Render *re;
ListBase fullresult;
char text[512]; /* IMA_MAX_RENDER_TEXT */
char text[512]; /* IMA_MAX_RENDER_TEXT_SIZE */
int resolution_x, resolution_y;