From 3a717adbf9d96278e95d6eb59a253f19c2edbc28 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sat, 16 Apr 2016 23:18:25 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"(XMB)=20Apply=20=20the=20fade=20in=20?=
 =?UTF-8?q?animation=20on=20the=20ribbon=20when=20launching=20RA=20or?=
 =?UTF-8?q?=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 menu/drivers/xmb.c  | 29 +++++++++--------------------
 menu/menu_display.c |  8 +++++++-
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 719e71446e..d3132157c7 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1900,8 +1900,7 @@ static void xmb_frame_horizontal_list(xmb_handle_t *xmb,
    }
 }
 
-static void xmb_draw_ribbon(xmb_handle_t *xmb,
-      menu_display_ctx_draw_t *draw)
+static void xmb_draw_ribbon(menu_display_ctx_draw_t *draw)
 {
 #ifdef XMB_RIBBON_ENABLE
    struct uniform_info uniform_param = {0};
@@ -1910,23 +1909,13 @@ static void xmb_draw_ribbon(xmb_handle_t *xmb,
    video_shader_ctx_info_t shader_info;
    math_matrix_4x4 mymat;
    struct gfx_coords coords;
-
    float white[16] = {
-      1, 1, 1, xmb->alpha,
-      1, 1, 1, xmb->alpha,
-      1, 1, 1, xmb->alpha,
-      1, 1, 1, xmb->alpha,
+      1, 1, 1, 1,
+      1, 1, 1, 1,
+      1, 1, 1, 1,
+      1, 1, 1, 1,
    };
 
-   float gradient[16] = {
-      1   , 0  , 0.1 , xmb->alpha,
-      1   , 0.1, 0   , xmb->alpha,
-      0.05, 0  , 0.05, xmb->alpha,
-      0.05, 0  , 0.05, xmb->alpha,
-   };
-
-   draw->color  = gradient;
-
    menu_display_ctl(MENU_DISPLAY_CTL_DRAW_GRADIENT, draw);
 
    xmb_blend_begin();
@@ -1968,12 +1957,12 @@ static void xmb_draw_ribbon(xmb_handle_t *xmb,
 #endif
 }
 
-static void xmb_draw_bg(xmb_handle_t *xmb, menu_display_ctx_draw_t *draw)
+static void xmb_draw_bg(menu_display_ctx_draw_t *draw)
 {
    menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);
    menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL);
 
-   xmb_draw_ribbon(xmb, draw);
+   xmb_draw_ribbon(draw);
 
    menu_display_ctl(MENU_DISPLAY_CTL_BLEND_END, NULL);
 }
@@ -2048,7 +2037,7 @@ static void xmb_frame(void *data)
       && !draw.force_transparency && draw.texture)
       draw.color             = &coord_color2[0];
 
-   xmb_draw_bg(xmb, &draw);
+   xmb_draw_bg(&draw);
 
    xmb_draw_text(xmb,
          xmb->title_name, xmb->margins.title.left,
@@ -2187,7 +2176,7 @@ static void xmb_frame(void *data)
             && !draw.force_transparency && draw.texture)
          draw.color             = &coord_color2[0];
 
-      xmb_draw_bg(xmb, &draw);
+      xmb_draw_bg(&draw);
 
       xmb_render_messagebox_internal(xmb, msg);
    }
diff --git a/menu/menu_display.c b/menu/menu_display.c
index 5f014d173c..713c61fc16 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -503,6 +503,12 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
             const float *new_vertex       = NULL;
             const float *new_tex_coord    = NULL;
             menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
+            float bg[16] = {
+               1, 0, 0.1, 1,
+               1, 0.1, 0, 1,
+               0.05, 0, 0.05, 1,
+               0.05, 0, 0.05, 1
+            };
 
             if (!menu_disp || !draw)
                return false;
@@ -519,7 +525,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
             coords.vertex        = new_vertex;
             coords.tex_coord     = new_tex_coord;
             coords.lut_tex_coord = new_tex_coord;
-            coords.color         = (const float*)draw->color;
+            coords.color         = bg;
 
             draw->x              = 0;
             draw->y              = 0;