Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-03-31 14:09:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-03-31 14:11:38 +0300
commit0ef38879b3adc200f65b24ab11e1134c6eeec161 (patch)
treebfa8220d514ccd55f332451039687de29d08fc31 /source/blender/blenfont/intern/blf_internal_types.h
parent8b74741b9e1b8ac2cead829a3ca2621bb5950865 (diff)
Cleanup: BLF batch drawing naming
- batching -> batch_draw. - ct & size -> len. - start/end -> begin/end (follow GL convention).
Diffstat (limited to 'source/blender/blenfont/intern/blf_internal_types.h')
-rw-r--r--source/blender/blenfont/intern/blf_internal_types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index 5808bd38990..a954cf22370 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -33,7 +33,7 @@
#include "../../../intern/gawain/gawain/gwn_vertex_buffer.h"
-#define BLF_BATCHING_SIZE 2048 /* in glyph */
+#define BLF_BATCH_DRAW_LEN_MAX 2048 /* in glyph */
typedef struct BatchBLF{
struct FontBLF *font; /* can only batch glyph from the same font */
@@ -41,7 +41,7 @@ typedef struct BatchBLF{
struct Gwn_VertBuf *verts;
struct Gwn_VertBufRaw pos_step, tex_step, col_step;
unsigned int pos_loc, tex_loc, col_loc;
- unsigned int glyph_ct;
+ unsigned int glyph_len;
float ofs[2]; /* copy of font->pos */
float mat[4][4]; /* previous call modelmatrix. */
bool enabled, active, simple_shader;