blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

UI: Perf: Use widget base batching 

Overall 10% more performance on general UI drawing time.

This commit can introduce ordering problem on some elements.
In this case you need to flush the widget cache to ensure the element that
is going to be drawn is drawn on top of any widget base.

To flush the cache use UI_widgetbase_draw_cache_flush.

This is already done for BLF and Icons.
This commit is contained in:
Clément Foucault 2018-04-06 14:30:20 +02:00
parent 21113ad834
commit 39b654f4ff
Notes: blender-bot 2023-02-14 10:21:15 +01:00 
Referenced by issue #54691, Display of OpenGL-generated icons broken after widget base batching changes
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenfont/intern/blf_font.c
View File

@ -58,6 +58,8 @@
#include "BIF_gl.h"
#include "BLF_api.h"
#include "UI_interface.h"
#include "GPU_immediate.h"
#include "GPU_matrix.h"
#include "GPU_batch.h"
@ -184,6 +186,9 @@ void blf_batch_draw(void)
glEnable(GL_BLEND);
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
/* We need to flush widget base first to ensure correct ordering. */
UI_widgetbase_draw_cache_flush();
BLI_assert(g_batch.font->tex_bind_state != 0); /* must still be valid */
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, g_batch.font->tex_bind_state);

2
source/blender/editors/interface/interface.c
View File

@ -1429,6 +1429,7 @@ void UI_block_draw(const bContext *C, uiBlock *block)
BLF_batch_draw_begin();
UI_icon_draw_cache_begin();
UI_widgetbase_draw_cache_begin();
/* widgets */
for (but = block->buttons.first; but; but = but->next) {
@ -1442,6 +1443,7 @@ void UI_block_draw(const bContext *C, uiBlock *block)
}
}
UI_widgetbase_draw_cache_end();
UI_icon_draw_cache_end();
BLF_batch_draw_end();

14
source/blender/editors/interface/interface_icons.c
View File

@ -1009,6 +1009,9 @@ static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect),
rect = ima->rect;
}
/* We need to flush widget base first to ensure correct ordering. */
UI_widgetbase_draw_cache_flush();
/* draw */
IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
immDrawPixelsTex(&state, draw_x, draw_y, draw_w, draw_h, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, rect,
@ -1049,6 +1052,12 @@ static void icon_draw_cache_flush_ex(void)
if (g_icon_draw_cache.calls == 0)
return;
/* We need to flush widget base first to ensure correct ordering. */
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
UI_widgetbase_draw_cache_flush();
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, icongltex.id);
@ -1078,7 +1087,6 @@ void UI_icon_draw_cache_end(void)
return;
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
icon_draw_cache_flush_ex();
@ -1125,6 +1133,10 @@ static void icon_draw_texture(
return;
}
/* We need to flush widget base first to ensure correct ordering. */
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
UI_widgetbase_draw_cache_flush();
float x1, x2, y1, y2;
x1 = ix * icongltex.invw;