mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XMB/Lakka) Silence some warnings

Browse Source
This commit is contained in:
Twinaphex 2014-10-14 22:37:01 +02:00
parent e67bcb28d0
commit c06a549bfe
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/menu/disp/lakka.c
View File

@ -89,7 +89,7 @@ static char *str_replace (const char *string,
static void lakka_draw_text(lakka_handle_t *lakka, static void lakka_draw_text(lakka_handle_t *lakka,
const char *str, float x, const char *str, float x,
float y, float scale, float alpha) float y, float scale_factor, float alpha)
{ {
if (alpha > lakka->global_alpha) if (alpha > lakka->global_alpha)
alpha = lakka->global_alpha; alpha = lakka->global_alpha;
@ -116,7 +116,7 @@ static void lakka_draw_text(lakka_handle_t *lakka,
params.x = x / gl->win_width; params.x = x / gl->win_width;
params.y = 1.0f - y / gl->win_height; params.y = 1.0f - y / gl->win_height;
params.scale = scale; params.scale = scale_factor;
params.color = FONT_COLOR_RGBA(255, 255, 255, a8); params.color = FONT_COLOR_RGBA(255, 255, 255, a8);
params.full_screen = true; params.full_screen = true;
@ -196,9 +196,12 @@ static void lakka_draw_background(bool force_transparency)
static void lakka_draw_icon(lakka_handle_t *lakka, static void lakka_draw_icon(lakka_handle_t *lakka,
GLuint texture, float x, float y, GLuint texture, float x, float y,
float alpha, float rotation, float scale) float alpha, float rotation,
float scale_factor)
{ {
struct gl_coords coords; struct gl_coords coords;
math_matrix mymat, mrot;
if (!lakka) if (!lakka)
return; return;
@ -236,14 +239,11 @@ static void lakka_draw_icon(lakka_handle_t *lakka,
coords.color = color; coords.color = color;
glBindTexture(GL_TEXTURE_2D, texture); glBindTexture(GL_TEXTURE_2D, texture);
math_matrix mymat;
math_matrix mrot;
matrix_rotate_z(&mrot, rotation); matrix_rotate_z(&mrot, rotation);
matrix_multiply(&mymat, &mrot, &gl->mvp_no_rot); matrix_multiply(&mymat, &mrot, &gl->mvp_no_rot);
math_matrix mscal; math_matrix mscal;
matrix_scale(&mscal, scale, scale, 1); matrix_scale(&mscal, scale_factor, scale_factor, 1);
matrix_multiply(&mymat, &mscal, &mymat); matrix_multiply(&mymat, &mscal, &mymat);
gl->shader->set_coords(&coords); gl->shader->set_coords(&coords);

13
frontend/menu/disp/xmb.c
View File

@ -118,9 +118,10 @@ static const GLfloat rmb_tex_coord[] = {
}; };
static void xmb_draw_icon(GLuint texture, float x, float y, static void xmb_draw_icon(GLuint texture, float x, float y,
float alpha, float rotation, float scale) float alpha, float rotation, float scale_factor)
{ {
struct gl_coords coords; struct gl_coords coords;
math_matrix mymat, mrot, mscal;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata; xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb) if (!xmb)
@ -160,14 +161,10 @@ static void xmb_draw_icon(GLuint texture, float x, float y,
coords.color = color; coords.color = color;
glBindTexture(GL_TEXTURE_2D, texture); glBindTexture(GL_TEXTURE_2D, texture);
math_matrix mymat;
math_matrix mrot;
matrix_rotate_z(&mrot, rotation); matrix_rotate_z(&mrot, rotation);
matrix_multiply(&mymat, &mrot, &gl->mvp_no_rot); matrix_multiply(&mymat, &mrot, &gl->mvp_no_rot);
math_matrix mscal; matrix_scale(&mscal, scale_factor, scale_factor, 1);
matrix_scale(&mscal, scale, scale, 1);
matrix_multiply(&mymat, &mscal, &mymat); matrix_multiply(&mymat, &mscal, &mymat);
gl->shader->set_coords(&coords); gl->shader->set_coords(&coords);
@ -180,7 +177,7 @@ static void xmb_draw_icon(GLuint texture, float x, float y,
} }
static void xmb_draw_text(const char *str, float x, static void xmb_draw_text(const char *str, float x,
float y, float scale, float alpha) float y, float scale_factor, float alpha)
{ {
uint8_t a8 = 0; uint8_t a8 = 0;
struct font_params params = {0}; struct font_params params = {0};
@ -209,7 +206,7 @@ static void xmb_draw_text(const char *str, float x,
params.x = x / gl->win_width; params.x = x / gl->win_width;
params.y = 1.0f - y / gl->win_height; params.y = 1.0f - y / gl->win_height;
params.scale = scale; params.scale = scale_factor;
params.color = FONT_COLOR_RGBA(255, 255, 255, a8); params.color = FONT_COLOR_RGBA(255, 255, 255, a8);
params.full_screen = true; params.full_screen = true;