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.
This commit is contained in:
Bill Currie 2012-04-21 20:59:04 +09:00
parent 7317aaf109
commit 1fd84477a2
2 changed files with 4 additions and 4 deletions

View file

@ -98,7 +98,7 @@ static struct {
{"mvp_mat", 1},
{"vertex", 0},
{"vcolor", 0},
{"char", 0},
{"dchar", 0},
};
static struct {

View file

@ -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;