mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use GRfloat/GRuint anymore

Browse Source
This commit is contained in:
twinaphex 2015-11-10 01:58:05 +01:00
parent 413d783127
commit 1666265427
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/video_common.h
View File

@ -22,9 +22,6 @@
#include <boolean.h> #include <boolean.h>
typedef float GRfloat;
typedef unsigned int GRuint;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

38
menu/drivers/zarch.c
View File

@ -52,25 +52,25 @@
#define ZARCH_DEBUG #define ZARCH_DEBUG
#endif #endif
const GRfloat ZUI_NORMAL[] = { const float ZUI_NORMAL[] = {
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
}; };
const GRfloat ZUI_HILITE[] = { const float ZUI_HILITE[] = {
1, 0, 0, 1, 1, 0, 0, 1,
1, 0, 0, 1, 1, 0, 0, 1,
1, 0, 0, 1, 1, 0, 0, 1,
1, 0, 0, 1, 1, 0, 0, 1,
}; };
const GRfloat ZUI_PRESS[] = { const float ZUI_PRESS[] = {
0, 1, 0, 1, 0, 1, 0, 1,
0, 1, 0, 1, 0, 1, 0, 1,
0, 1, 0, 1, 0, 1, 0, 1,
0, 1, 0, 1, 0, 1, 0, 1,
}; };
const GRfloat ZUI_BARBG[] = { const float ZUI_BARBG[] = {
0, 0, 1, 1, 0, 0, 1, 1,
0, 0, 1, 1, 0, 0, 1, 1,
0, 0, 1, 1, 0, 0, 1, 1,
@ -78,26 +78,26 @@ const GRfloat ZUI_BARBG[] = {
}; };
const uint32_t ZUI_FG_NORMAL = ~0; const uint32_t ZUI_FG_NORMAL = ~0;
const GRfloat ZUI_BG_PANEL[] = { const float ZUI_BG_PANEL[] = {
0, 0, 0, 0.25, 0, 0, 0, 0.25,
0, 0, 0, 0.25, 0, 0, 0, 0.25,
0, 0, 0, 0.25, 0, 0, 0, 0.25,
0, 0, 0, 0.25, 0, 0, 0, 0.25,
}; };
const GRfloat ZUI_BG_SCREEN[] = { const float ZUI_BG_SCREEN[] = {
0.07, 0.19, 0.26, 0.75, 0.07, 0.19, 0.26, 0.75,
0.07, 0.19, 0.26, 0.75, 0.07, 0.19, 0.26, 0.75,
0.15, 0.31, 0.47, 0.75, 0.15, 0.31, 0.47, 0.75,
0.15, 0.31, 0.47, 0.75, 0.15, 0.31, 0.47, 0.75,
}; };
const GRfloat ZUI_BG_HILITE[] = { const float ZUI_BG_HILITE[] = {
0.22, 0.60, 0.74, 1, 0.22, 0.60, 0.74, 1,
0.22, 0.60, 0.74, 1, 0.22, 0.60, 0.74, 1,
0.22, 0.60, 0.74, 1, 0.22, 0.60, 0.74, 1,
0.22, 0.60, 0.74, 1, 0.22, 0.60, 0.74, 1,
}; };
const GRfloat ZUI_BG_PAD_HILITE[] = { const float ZUI_BG_PAD_HILITE[] = {
0.30, 0.76, 0.93, 1, 0.30, 0.76, 0.93, 1,
0.30, 0.76, 0.93, 1, 0.30, 0.76, 0.93, 1,
0.30, 0.76, 0.93, 1, 0.30, 0.76, 0.93, 1,
@ -145,11 +145,11 @@ typedef struct zarch_handle
{ {
struct struct
{ {
GRuint id; uintptr_t id;
char path[PATH_MAX_LENGTH]; char path[PATH_MAX_LENGTH];
} bg; } bg;
GRuint white; uintptr_t white;
} textures; } textures;
/* LAY_ROOT's "Recent" */ /* LAY_ROOT's "Recent" */
@ -327,11 +327,11 @@ static void zarch_zui_draw_text(zui_t *zui, uint32_t color, int x, int y, const
} }
static void zarch_zui_push_quad(unsigned width, unsigned height, static void zarch_zui_push_quad(unsigned width, unsigned height,
const GRfloat *colors, gfx_coord_array_t *ca, int x1, int y1, const float *colors, gfx_coord_array_t *ca, int x1, int y1,
int x2, int y2) int x2, int y2)
{ {
gfx_coords_t coords; gfx_coords_t coords;
GRfloat vertex[8]; float vertex[8];
vertex[0] = x1 / (float)width; vertex[0] = x1 / (float)width;
vertex[1] = y1 / (float)height; vertex[1] = y1 / (float)height;
@ -419,8 +419,8 @@ static void zarch_zui_snow(zui_t *zui, gfx_coord_array_t *ca, int width, int hei
for (i = 0; i < NPARTICLES; ++i) for (i = 0; i < NPARTICLES; ++i)
{ {
unsigned j; unsigned j;
GRfloat alpha; float alpha;
GRfloat colors[16]; float colors[16];
part_t *p = &particles[i]; part_t *p = &particles[i];
if (!p->alive) if (!p->alive)
@ -445,7 +445,7 @@ static bool zarch_zui_button_full(zui_t *zui, int x1, int y1, int x2, int y2, co
{ {
unsigned id = zarch_zui_hash(zui, label); unsigned id = zarch_zui_hash(zui, label);
bool active = zarch_zui_check_button_up(zui, id, x1, y1, x2, y2); bool active = zarch_zui_check_button_up(zui, id, x1, y1, x2, y2);
const GRfloat *bg = ZUI_BG_PANEL; const float *bg = ZUI_BG_PANEL;
if (zui->item.active == id || zui->item.hot == id) if (zui->item.active == id || zui->item.hot == id)
bg = ZUI_BG_HILITE; bg = ZUI_BG_HILITE;
@ -471,7 +471,7 @@ static bool zarch_zui_list_item(zui_t *zui, zui_tabbed_t *tab, int x1, int y1,
int x2 = x1 + zui->width - 290 - 40; int x2 = x1 + zui->width - 290 - 40;
int y2 = y1 + 50; int y2 = y1 + 50;
bool active = zarch_zui_check_button_up(zui, id, x1, y1, x2, y2); bool active = zarch_zui_check_button_up(zui, id, x1, y1, x2, y2);
const GRfloat *bg = ZUI_BG_PANEL; const float *bg = ZUI_BG_PANEL;
uint64_t *frame_count = video_driver_get_frame_count(); uint64_t *frame_count = video_driver_get_frame_count();
if (tab->active_id != tab->prev_id) if (tab->active_id != tab->prev_id)
@ -534,7 +534,7 @@ static bool zarch_zui_tab(zui_t *zui, zui_tabbed_t *tab, const char *label, unsi
int x1, y1, x2, y2; int x1, y1, x2, y2;
unsigned id = zarch_zui_hash(zui, label); unsigned id = zarch_zui_hash(zui, label);
int width = tab->tab_width; int width = tab->tab_width;
const GRfloat *bg = ZUI_BG_PANEL; const float *bg = ZUI_BG_PANEL;
bool selected = tab->tab_selection == tab_id; /* TODO/FIXME */ bool selected = tab->tab_selection == tab_id; /* TODO/FIXME */
if (!width) if (!width)
@ -962,8 +962,8 @@ static int zarch_zui_render_pick_core(zui_t *zui)
static void zarch_frame(void) static void zarch_frame(void)
{ {
unsigned i; unsigned i;
GRfloat coord_color[16]; float coord_color[16];
GRfloat coord_color2[16]; float coord_color2[16];
zui_t *zui = NULL; zui_t *zui = NULL;
const struct font_renderer *font_driver = NULL; const struct font_renderer *font_driver = NULL;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();