[Bf-blender-cvs] [b757e82] blender2.8: Convert console_draw.c to Gawain

[Martijn Berger]

Commit: b757e8298abd92d136d54d2ce4811135dcd20c86
Author: Martijn Berger
Date:   Wed Nov 16 22:56:39 2016 +0100
Branches: blender2.8
https://developer.blender.org/rBb757e8298abd92d136d54d2ce4811135dcd20c86

Convert console_draw.c to Gawain

Reviewers: merwin

Reviewed By: merwin

Tags: #bf_blender_2.8

Differential Revision: https://developer.blender.org/D2276

===================================================================

M	source/blender/editors/space_console/console_draw.c

===================================================================

diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c
index 6396b39..c45b8ac 100644
--- a/source/blender/editors/space_console/console_draw.c
+++ b/source/blender/editors/space_console/console_draw.c
@@ -40,6 +40,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BIF_gl.h"
+#include "GPU_immediate.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
@@ -157,6 +158,8 @@ static int console_textview_line_color(struct TextViewContext *tvc, unsigned cha
 		int offl = 0, offc = 0;
 		int xy[2] = {CONSOLE_DRAW_MARGIN, CONSOLE_DRAW_MARGIN};
 		int pen[2];
+		VertexFormat* format = immVertexFormat();
+		unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT);
 		xy[1] += tvc->lheight / 6;
 
 		console_cursor_wrap_offset(sc->prompt, tvc->console_width, &offl, &offc, NULL);
@@ -168,14 +171,17 @@ static int console_textview_line_color(struct TextViewContext *tvc, unsigned cha
 		pen[1] += tvc->lheight * offl;
 
 		/* cursor */
-		UI_GetThemeColor3ubv(TH_CONSOLE_CURSOR, fg);
-		glColor3ubv(fg);
-
-		glRecti((xy[0] + pen[0]) - 1,
-		        (xy[1] + pen[1]),
-		        (xy[0] + pen[0]) + 1,
-		        (xy[1] + pen[1] + tvc->lheight)
-		        );
+		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		immUniformThemeColor(TH_CONSOLE_CURSOR);
+
+		immRectf(pos,
+		         (xy[0] + pen[0]) - 1,
+		         (xy[1] + pen[1]),
+		         (xy[0] + pen[0]) + 1,
+		         (xy[1] + pen[1] + tvc->lheight)
+		         );
+
+		immUnbindProgram();
 	}
 
 	console_line_color(fg, cl_iter->type);