From 1fd84477a2d34bd1fbd9d31e79f7a0eb2284602e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Apr 2012 20:59:04 +0900
Subject: [PATCH] Rename char to dchar in the text vertex shader.

Thanks to Spirit :)

Turns out certain drivers (nvidia?) reserve "char" even though opengl does
not. This should fix his missing console text.
---
 libs/video/renderer/glsl/glsl_draw.c   | 2 +-
 libs/video/renderer/glsl/quaketxt.vert | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/video/renderer/glsl/glsl_draw.c b/libs/video/renderer/glsl/glsl_draw.c
index 624926e1c..9672859e4 100644
--- a/libs/video/renderer/glsl/glsl_draw.c
+++ b/libs/video/renderer/glsl/glsl_draw.c
@@ -98,7 +98,7 @@ static struct {
 	{"mvp_mat", 1},
 	{"vertex", 0},
 	{"vcolor", 0},
-	{"char", 0},
+	{"dchar", 0},
 };
 
 static struct {
diff --git a/libs/video/renderer/glsl/quaketxt.vert b/libs/video/renderer/glsl/quaketxt.vert
index f3219d652..4c4c6f216 100644
--- a/libs/video/renderer/glsl/quaketxt.vert
+++ b/libs/video/renderer/glsl/quaketxt.vert
@@ -21,7 +21,7 @@ attribute vec4 vcolor;
 	The quake character map supports only 256 characters, 0-255. Any other
 	value will give interesting results.
 */
-attribute float char;
+attribute float dchar;
 
 /** Coordinate in character map texture.
 */
@@ -36,8 +36,8 @@ main (void)
 	const vec2  inset = vec2 (0.03125, 0.03125);
 	const vec2  size = vec2 (0.0625, 0.0625);
 
-	row = floor (char / 16.0);
-	col = mod (char, 16.0);
+	row = floor (dchar / 16.0);
+	col = mod (dchar, 16.0);
 
 	pos = vertex.xy;
 	corner = vertex.zw;