Use custom typedefs for glui too, and move typedefs to gfx/video_common.h
This commit is contained in:
parent
ccafdf8cc4
commit
5a5e3951ff
|
@ -22,6 +22,9 @@
|
||||||
|
|
||||||
#include <boolean.h>
|
#include <boolean.h>
|
||||||
|
|
||||||
|
typedef float GRfloat;
|
||||||
|
typedef unsigned int GRuint;
|
||||||
|
|
||||||
struct gfx_fbo_rect
|
struct gfx_fbo_rect
|
||||||
{
|
{
|
||||||
unsigned img_width;
|
unsigned img_width;
|
||||||
|
|
|
@ -49,10 +49,10 @@ typedef struct glui_handle
|
||||||
{
|
{
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
GLuint id;
|
GRuint id;
|
||||||
char path[PATH_MAX_LENGTH];
|
char path[PATH_MAX_LENGTH];
|
||||||
} bg;
|
} bg;
|
||||||
GLuint white;
|
GRuint white;
|
||||||
} textures;
|
} textures;
|
||||||
|
|
||||||
gfx_font_raster_block_t list_block;
|
gfx_font_raster_block_t list_block;
|
||||||
|
@ -90,7 +90,7 @@ static void glui_render_quad(gl_t *gl, int x, int y, int w, int h,
|
||||||
{
|
{
|
||||||
unsigned width, height;
|
unsigned width, height;
|
||||||
struct gfx_coords coords;
|
struct gfx_coords coords;
|
||||||
GLfloat color[16], tex_coord[8], vertex[8];
|
GRfloat color[16], tex_coord[8], vertex[8];
|
||||||
menu_handle_t *menu = menu_driver_get_ptr();
|
menu_handle_t *menu = menu_driver_get_ptr();
|
||||||
glui_handle_t *glui = (glui_handle_t*)menu->userdata;
|
glui_handle_t *glui = (glui_handle_t*)menu->userdata;
|
||||||
|
|
||||||
|
|
|
@ -48,9 +48,6 @@
|
||||||
#define XMB_DELAY 10
|
#define XMB_DELAY 10
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef float GRfloat;
|
|
||||||
typedef unsigned int GRuint;
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
float alpha;
|
float alpha;
|
||||||
|
|
Loading…
Reference in New Issue