diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-10 13:21:13 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-10 13:21:13 +0300 |
| commit | f87815705b8fcdc4f4a527303429a32ecca3fd88 (patch) | |
| tree | 6b146c24c2978ec144426b267650965a7e86a6af /source/blender/blenfont | |
| parent | b6ba507c1be23fd9e6af975ed9dddcf7a57cf8f3 (diff) | |
Make build with GL 3.3 again
This is a workaround while the PRIM_QUADS_XXX are still in the code
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 3702c70be35..3a736473f57 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -206,6 +206,7 @@ static void blf_font_draw_ex( blf_font_ensure_ascii_table(font); +#ifdef WITH_GL_PROFILE_COMPAT immBeginAtMost(PRIM_QUADS_XXX, verts_needed(font, str, len)); /* at most because some glyphs might be clipped & not drawn */ @@ -227,6 +228,7 @@ static void blf_font_draw_ex( } immEnd(); +#endif if (r_info) { r_info->lines = 1; @@ -253,6 +255,7 @@ static void blf_font_draw_ascii_ex( blf_font_ensure_ascii_table(font); +#ifdef WITH_GL_PROFILE_COMPAT immBeginAtMost(PRIM_QUADS_XXX, verts_needed(font, str, len)); while ((c = *(str++)) && len--) { @@ -270,6 +273,7 @@ static void blf_font_draw_ascii_ex( } immEnd(); +#endif if (r_info) { r_info->lines = 1; @@ -293,6 +297,7 @@ int blf_font_draw_mono(FontBLF *font, const char *str, size_t len, int cwidth) blf_font_ensure_ascii_table(font); +#ifdef WITH_GL_PROFILE_COMPAT immBeginAtMost(PRIM_QUADS_XXX, verts_needed(font, str, len)); while ((i < len) && str[i]) { @@ -315,6 +320,7 @@ int blf_font_draw_mono(FontBLF *font, const char *str, size_t len, int cwidth) } immEnd(); +#endif return columns; } |