diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-02-28 23:22:43 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-02-28 23:30:39 +0300 |
| commit | 7b1e5e86202b1f4cf6305c422ca8519e912c1511 (patch) | |
| tree | 62790d17ad86f3ebe25741a106d3e68a4953f76d /source/blender/editors | |
| parent | 2fcdb6df10ac2c0b7d62090756a698df45443e6a (diff) | |
remove unused code from interface_icons
No longer depends on basic shader API
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 526e73e33e5..cc7f1532b9d 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "GPU_extensions.h" -#include "GPU_basic_shader.h" #include "GPU_draw.h" #include "GPU_immediate.h" @@ -1007,25 +1005,9 @@ static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect), } /* draw */ -#if 0 - if (is_preview) { - immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR); - immDrawPixelsTex(draw_x, draw_y, draw_w, draw_h, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, rect, - 1.0f, 1.0f, col); - } - else { -#endif - int bound_options; - GPU_BASIC_SHADER_DISABLE_AND_STORE(bound_options); - - immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR); - immDrawPixelsTex(draw_x, draw_y, draw_w, draw_h, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, rect, - 1.0f, 1.0f, col); - - GPU_BASIC_SHADER_ENABLE_AND_RESTORE(bound_options); -#if 0 - } -#endif + immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR); + immDrawPixelsTex(draw_x, draw_y, draw_w, draw_h, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, rect, + 1.0f, 1.0f, col); if (ima) IMB_freeImBuf(ima); @@ -1075,7 +1057,6 @@ static void icon_draw_texture( glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, 0.0f); glBindTexture(GL_TEXTURE_2D, 0); - GPU_basic_shader_bind(GPU_SHADER_USE_COLOR); } /* Drawing size for preview images */ |