diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-11 02:58:23 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-13 15:20:24 +0300 |
commit | ac60a67b3f6eacbcff5b5c4716fd5e3902511a29 (patch) | |
tree | 486054624ca8c881751b2569cc872b37fb0b8695 /source/blender/blenfont | |
parent | efc97b3919ea4fd46b9d2e931ca3fea27e7ea31c (diff) |
Cleanup: GPU: Remove Batch vao cache reset
This is done at drawtime automatically.
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r-- | source/blender/blenfont/BLF_api.h | 3 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf.c | 5 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 7 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_internal.h | 1 |
4 files changed, 1 insertions, 15 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index 9013836fd1e..bf84f5c57b3 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -42,8 +42,7 @@ int BLF_init(void); void BLF_exit(void); void BLF_default_dpi(int dpi); void BLF_default_set(int fontid); -int BLF_default(void); /* get default font ID so we can pass it to other functions */ -void BLF_batch_reset(void); /* call when changing opengl context. */ +int BLF_default(void); /* get default font ID so we can pass it to other functions */ void BLF_cache_clear(void); diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 95b074fa2df..c5c2bc3f3ba 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -125,11 +125,6 @@ void BLF_exit(void) blf_font_exit(); } -void BLF_batch_reset(void) -{ - blf_batch_draw_vao_clear(); -} - void BLF_cache_clear(void) { FontBLF *font; diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index ff31878a929..76829db755c 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -113,13 +113,6 @@ static void blf_batch_draw_exit(void) GPU_BATCH_DISCARD_SAFE(g_batch.batch); } -void blf_batch_draw_vao_clear(void) -{ - if (g_batch.batch) { - GPU_batch_vao_cache_clear(g_batch.batch); - } -} - void blf_batch_draw_begin(FontBLF *font) { if (g_batch.batch == NULL) { diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h index ba0873f4fd4..b616f47a897 100644 --- a/source/blender/blenfont/intern/blf_internal.h +++ b/source/blender/blenfont/intern/blf_internal.h @@ -30,7 +30,6 @@ struct ResultBLF; struct rctf; struct rcti; -void blf_batch_draw_vao_clear(void); void blf_batch_draw_begin(struct FontBLF *font); void blf_batch_draw(void); |