diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-06 00:11:31 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-06 21:35:15 +0300 |
commit | 4aab21f9be6ed0598279cfd0086181a99c28b50e (patch) | |
tree | d5378eb1ef12e7ff042923af4395a76312519e4d /source/blender/blenfont/intern/blf.c | |
parent | cf921934b1a6a30461779e26d67d02d0b66bdafc (diff) |
OpenGL: rename simple shader to basic shader.
Diffstat (limited to 'source/blender/blenfont/intern/blf.c')
-rw-r--r-- | source/blender/blenfont/intern/blf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 8b654d25bcf..6c3fd090d4a 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -55,7 +55,7 @@ #include "IMB_colormanagement.h" -#include "GPU_simple_shader.h" +#include "GPU_basic_shader.h" #include "blf_internal_types.h" #include "blf_internal.h" @@ -498,7 +498,7 @@ static void blf_draw_gl__start(FontBLF *font, GLint *mode) glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GPU_simple_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR); + GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR); /* Save the current matrix mode. */ glGetIntegerv(GL_MATRIX_MODE, mode); @@ -539,7 +539,7 @@ static void blf_draw_gl__end(GLint mode) if (mode != GL_MODELVIEW) glMatrixMode(mode); - GPU_simple_shader_bind(GPU_SHADER_USE_COLOR); + GPU_basic_shader_bind(GPU_SHADER_USE_COLOR); glDisable(GL_BLEND); } |