diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-04-28 02:29:51 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-04-28 17:33:15 +0300 |
commit | c06bfe9d09c33cebdffd2c840252d4863fd8ca33 (patch) | |
tree | 7949e7070c6411950770c3d584583749a623201f /source/blender/editors/interface/interface_widgets.c | |
parent | c6fccbf842d8335dce156f608e631aca4a593100 (diff) |
UI: Remove hardcoded 11 uniform parameters
Using a define makes it easy to increase this later.
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index bd6ee41a6de..0a1c35961fd 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1032,6 +1032,7 @@ static void widgetbase_set_uniform_colors_ubv( /* keep in sync with shader */ #define MAX_WIDGET_BASE_BATCH 6 +#define MAX_WIDGET_PARAMETERS 11 struct { Gwn_Batch *batch; /* Batch type */ @@ -1051,13 +1052,14 @@ void UI_widgetbase_draw_cache_flush(void) if (g_widget_base_batch.count == 1) { /* draw single */ GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE); - GWN_batch_uniform_4fv_array(batch, "parameters", 11, (float *)g_widget_base_batch.params); + GWN_batch_uniform_4fv_array(batch, "parameters", MAX_WIDGET_PARAMETERS, (float *)g_widget_base_batch.params); GWN_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params); GWN_batch_draw(batch); } else { GWN_batch_program_set_builtin(batch, GPU_SHADER_2D_WIDGET_BASE_INST); - GWN_batch_uniform_4fv_array(batch, "parameters", 11 * MAX_WIDGET_BASE_BATCH, (float *)g_widget_base_batch.params); + GWN_batch_uniform_4fv_array(batch, "parameters", MAX_WIDGET_PARAMETERS * MAX_WIDGET_BASE_BATCH, + (float *)g_widget_base_batch.params); GWN_batch_uniform_3fv(batch, "checkerColorAndSize", checker_params); gpuBindMatrices(batch->interface); GWN_batch_draw_range_ex(batch, 0, g_widget_base_batch.count, true); |