diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-03-24 22:27:39 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-03-25 21:06:11 +0300 |
| commit | b1c025d1e8dd3a26e66740eab102814da76c06bf (patch) | |
| tree | 57a11ca3d0b86650c897571014b67b70e66a3e10 /source/blender/blenfont | |
| parent | 879eabedda2790fd39d0e2f66184bceb6e0dbf4b (diff) | |
GPUTexture: Small refactor.
This includes a few modification:
- The biggest one is call glActiveTexture before doing any call to
glBindTexture for rendering purpose (uniform value depends on it).
This is also better to know what's going on when rendering UI. So if
there is missing UI elements because of this commit look for this first.
This allows us to have "less calls" to glActiveTexture (I did not
measure the final count) and less checks inside GPU_texture.
- Remove use of GL_TEXTURE0 as a uniform value in a few places.
- Be more strict and use BLI_assert for bad usage of GPU_texture functions.
- Disable filtering for integer and stencil textures (not supported by
OGL specs).
- Replace bools inside GPUTexture by a bitflag supporting more options to
identify texture types.
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index a7d52e96800..5a8691c9b4f 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -410,6 +410,8 @@ void blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y) if ((!g->width) || (!g->height)) return; + glActiveTexture(GL_TEXTURE0); + if (g->build_tex == 0) { GlyphCacheBLF *gc = font->glyph_cache; |