From ec4f96134846919c8a9734baf44620c199643d2d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 17 Apr 2016 17:59:40 +0200 Subject: [PATCH] (XMB Cg) Ribbon works with Cg now too --- gfx/drivers/gl_shaders/pipeline_xmb_ribbon.cg.h | 2 +- gfx/drivers_shader/shader_gl_cg.c | 5 +---- menu/drivers/xmb.c | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gfx/drivers/gl_shaders/pipeline_xmb_ribbon.cg.h b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon.cg.h index b5ec39d44a..de84f75c4b 100644 --- a/gfx/drivers/gl_shaders/pipeline_xmb_ribbon.cg.h +++ b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon.cg.h @@ -6,7 +6,7 @@ static const char *stock_xmb = "float iqhash(float n)\n" "{\n" -"return fract(sin(n)*43758.5453);\n" +"return frac(sin(n)*43758.5453);\n" "}\n" "float noise(float3 x)\n" diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 121050eef8..33fee34959 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -146,10 +146,7 @@ static void gl_cg_set_uniform_parameter( } if (param->lookup.add_prefix) - { - strlcat(ident, "IN.", sizeof(ident)); - strlcat(ident, param->lookup.ident, sizeof(ident)); - } + snprintf(ident, sizeof(ident), "IN.%s", param->lookup.ident); location = cgGetNamedParameter(prog, param->lookup.add_prefix ? ident : param->lookup.ident); } else diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 01a8fe0f1b..350569ac23 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1939,6 +1939,7 @@ static void xmb_draw_ribbon(menu_display_ctx_draw_t *draw) t += 0.01; + uniform_param.enabled = true; uniform_param.lookup.enable = true; uniform_param.lookup.add_prefix = true; uniform_param.lookup.idx = VIDEO_SHADER_MENU;