Better OSD behavior, lots of build stuff

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 13 insertions, 15 deletions

diff --git a/src/render/shaders/osd_header.h b/src/render/shaders/osd_header.h
index 5ba6491..fad6921 100644
--- a/src/render/shaders/osd_header.h
+++ b/src/render/shaders/osd_header.h
@@ -95,11 +95,9 @@ static char osd_header_shader[] = \
 "#define ch_rpa uvec4(0x00E030,0x30180C,0x183030,0xE00000)\n"
 "#define ch_tid uvec4(0x0073DA,0xCE0000,0x000000,0x000000)\n"
 "#define ch_lar uvec4(0x000000,0x10386C,0xC6C6FE,0x000000)\n"
-"#define spaces(n) for (int i = 0; i < n; i++) { col += char(ch_spc,uv); }\n"
+"#define spaces(n) for (int i = 0; i < n; i++) { col += ch(ch_spc,uv); }\n"
 "#define STRW(c) (c*8.)\n"
 "#define STRH(c) (c*12.)\n"
-"const vec4 tcolor = vec4(0.78,0.76,0.76,1.);\n"
-"const vec4 bcolor = vec4(0.1,0.1,0.1,0.65);\n"
 "vec2 pp = vec2(0.);\n"
 "float in_box(vec2 v, vec2 bl, vec2 tr) {\n"
 " vec2 s = step(bl,v)-step(tr,v);\n"
@@ -117,30 +115,30 @@ static char osd_header_shader[] = \
 " return in_box(uv,vec2(0.),vec2(8.,12.))*float(bv.x+bv.y+bv.z+bv.w);\n"
 #endif
 "}\n"
-"float char(uvec4 ch, vec2 uv) {\n"
+"float ch(uvec4 ch, vec2 uv) {\n"
 " float px = sprite(ch,floor(uv-pp));\n"
 " pp += vec2(8.,0.);\n"
 " return px;\n"
 "}\n"
 "uvec4 digit(uint d) {\n"
 " switch (d) {\n"
-"  case 0: return ch_0;\n"
-"  case 1: return ch_1;\n"
-"  case 2: return ch_2;\n"
-"  case 3: return ch_3;\n"
-"  case 4: return ch_4;\n"
-"  case 5: return ch_5;\n"
-"  case 6: return ch_6;\n"
-"  case 7: return ch_7;\n"
-"  case 8: return ch_8;\n"
-"  case 9:\n"
+"  case 0u: return ch_0;\n"
+"  case 1u: return ch_1;\n"
+"  case 2u: return ch_2;\n"
+"  case 3u: return ch_3;\n"
+"  case 4u: return ch_4;\n"
+"  case 5u: return ch_5;\n"
+"  case 6u: return ch_6;\n"
+"  case 7u: return ch_7;\n"
+"  case 8u: return ch_8;\n"
+"  case 9u:\n"
 "  default: return ch_9;\n"
 " }\n"
 "}\n"
 "float integer(uint number, vec2 uv) {\n"
 " float r = 0.;\n"
 " for (int i = 1; i >= 0; i--) {\n"
-"  r += char(digit(uint(mod(float(number)/max(1.,float(i)*10.),10.))),uv);\n"
+"  r += ch(digit(uint(mod(float(number)/max(1.,float(i)*10.),10.))),uv);\n"
 " }\n"
 " return r;\n"
 "}\n";