(Zarch) Cleanups

This commit is contained in:
twinaphex 2015-10-24 05:57:19 +02:00
parent e43d0f5edb
commit 17132d1a20

View File

@ -253,9 +253,6 @@ static void zui_finish(zui_t *zui,
zui->item.active = -1;
glViewport(x, y, width, height);
#if 0
glBindTexture(GL_TEXTURE_2D, texture);
#endif
glBindTexture(GL_TEXTURE_2D, 0);
gl->shader->set_coords(&zui->ca);
@ -473,9 +470,6 @@ static void zui_snow(zui_t *zui)
static bool zui_button_full(zui_t *zui, int x1, int y1, int x2, int y2, const char *label)
{
unsigned id = zui_hash(zui, label);
#if 0
int x2 = x1 + zui_strwidth(zui->fb_buf, label, 1.0) + 16;
#endif
bool active = check_button_up(zui, id, x1, y1, x2, y2);
const GLfloat *bg = ZUI_BG_PANEL;
@ -681,8 +675,8 @@ static void render_lay_root(zui_t *zui)
{
unsigned size = zui->load_dlist->size;
unsigned i, j = 1;
unsigned skip = 0;
for (i = 0; i < size; ++i)
{
const char *basename = path_basename(zui->load_dlist->elems[i].data);
@ -884,10 +878,8 @@ static void zui_render(void)
static void zarch_draw_cursor(gl_t *gl, float x, float y)
{
#if 0
zarch_render_quad(gl, x-5, y-5, 10, 10, 1, 1, 1, 1);
#endif
}
static void zarch_get_message(const char *message)
{
@ -917,18 +909,13 @@ static void zarch_frame(void)
unsigned i;
GRfloat coord_color[16];
GRfloat coord_color2[16];
zui_t *zui = NULL;
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
zui_t *zui = NULL;
gl_t *gl = NULL;
gl_t *gl = (gl_t*)video_driver_get_ptr(NULL);
if (!menu)
return;
gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl)
if (!menu || !gl)
return;
(void)driver;
@ -1063,8 +1050,8 @@ static void zarch_context_bg_destroy(zui_t *zarch)
static void zarch_context_destroy(void)
{
gl_t *gl = (gl_t*)video_driver_get_ptr(NULL);
zui_t *zarch = NULL;
gl_t *gl = (gl_t*)video_driver_get_ptr(NULL);
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();