diff options
author | Ray Molenkamp <github@lazydodo.com> | 2018-06-28 04:07:23 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2018-06-28 04:07:23 +0300 |
commit | 8e02106d0ddc7b31844d26037a824d56d3c65663 (patch) | |
tree | bfa1898220d74ac9610b8a1363a4087a44f7b41d /source/blender/editors/space_info | |
parent | fe258fd4451a7fb1ccdd85d1607b6dbd30442f28 (diff) |
GLRefactor: partially remove gl calls from source/blender/editors.
This translates the gl calls to the new GPU_ wrappers from D3501.
Given it's tedious and repetitive work, this patch does as much as it can with search + replace, the remainder of the gl calls will need to be manually dealt with on a case by case basis.
This fixes 13 of the 28 failing editors when building without opengl.
For the list of substitutions see D3502
Reviewers: brecht
Differential Revision: https://developer.blender.org/D3502
Diffstat (limited to 'source/blender/editors/space_info')
-rw-r--r-- | source/blender/editors/space_info/info_draw.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_info/space_info.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_info/textview.c | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c index 9421567b6ba..ecd0b082df6 100644 --- a/source/blender/editors/space_info/info_draw.c +++ b/source/blender/editors/space_info/info_draw.c @@ -51,6 +51,7 @@ #include "info_intern.h" #include "textview.h" +#include "GPU_framebuffer.h" /* complicates things a bit, so leaving in old simple code */ #define USE_INFO_NEWLINE @@ -130,7 +131,7 @@ static int report_textview_begin(TextViewContext *tvc) tvc->iter = reports->list.last; UI_ThemeClearColor(TH_BACK); - glClear(GL_COLOR_BUFFER_BIT); + GPU_clear(GPU_COLOR_BIT); #ifdef USE_INFO_NEWLINE tvc->iter_tmp = 0; diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index 65b3c7bb9fd..4273404ac90 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -60,6 +60,7 @@ #include "info_intern.h" /* own include */ #include "BLO_readfile.h" +#include "GPU_framebuffer.h" /* ******************** default callbacks for info space ***************** */ @@ -157,7 +158,7 @@ static void info_main_region_draw(const bContext *C, ARegion *ar) /* clear and setup matrix */ UI_ThemeClearColor(TH_BACK); - glClear(GL_COLOR_BUFFER_BIT); + GPU_clear(GPU_COLOR_BIT); /* quick way to avoid drawing if not bug enough */ if (ar->winy < 16) diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index 85de70c020f..a1e3842f887 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -40,6 +40,7 @@ #include "BLI_string_utf8.h" #include "GPU_immediate.h" +#include "GPU_state.h" #include "BIF_gl.h" @@ -81,8 +82,8 @@ static void console_draw_sel(const char *str, const int sel[2], const int xy[2], const int sta = txt_utf8_offset_to_column(str, max_ii(sel[0], 0)); const int end = txt_utf8_offset_to_column(str, min_ii(sel[1], str_len_draw)); - glEnable(GL_BLEND); - glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + GPU_blend(true); + GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); Gwn_VertFormat *format = immVertexFormat(); unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT); @@ -93,7 +94,7 @@ static void console_draw_sel(const char *str, const int sel[2], const int xy[2], immUnbindProgram(); - glDisable(GL_BLEND); + GPU_blend(false); } } |