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

Should hopefully fix all compilation problems

Browse Source
This commit is contained in:
twinaphex 2015-11-02 23:37:16 +01:00
parent 66c980210f
commit ea103fa7ec
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
menu/menu_display.c
View File

@ -660,25 +660,6 @@ void menu_display_clear_color(float r, float g, float b, float a)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
} }
unsigned menu_display_texture_load(void *data, enum texture_filter_type type)
{
return video_texture_load(data, TEXTURE_BACKEND_OPENGL, type);
}
void menu_display_texture_unload(uintptr_t *id)
{
if (!id)
return;
video_texture_unload(id);
}
#else
static math_matrix_4x4 *menu_display_get_default_mvp(void)
{
return NULL;
}
#endif
void menu_display_matrix_4x4_rotate_z(void *data, float rotation, void menu_display_matrix_4x4_rotate_z(void *data, float rotation,
float scale_x, float scale_y, float scale_z, bool scale_enable) float scale_x, float scale_y, float scale_z, bool scale_enable)
{ {
@ -699,6 +680,26 @@ void menu_display_matrix_4x4_rotate_z(void *data, float rotation,
matrix_4x4_multiply(matrix, &matrix_scaled, matrix); matrix_4x4_multiply(matrix, &matrix_scaled, matrix);
} }
unsigned menu_display_texture_load(void *data, enum texture_filter_type type)
{
return video_texture_load(data, TEXTURE_BACKEND_OPENGL, type);
}
void menu_display_texture_unload(uintptr_t *id)
{
if (!id)
return;
video_texture_unload(id);
}
#else
static math_matrix_4x4 *menu_display_get_default_mvp(void)
{
return NULL;
}
#endif
static const char *menu_video_get_ident(void) static const char *menu_video_get_ident(void)
{ {
#ifdef HAVE_THREADS #ifdef HAVE_THREADS

4
menu/menu_display.h
View File

@ -130,12 +130,12 @@ void menu_display_restore_clear_color(void);
void menu_display_clear_color(float r, float g, float b, float a); void menu_display_clear_color(float r, float g, float b, float a);
void menu_display_matrix_4x4_rotate_z(void *data, float rotation,
float scale_x, float scale_y, float scale_z, bool scale_enable);
#endif #endif
const float *menu_display_get_tex_coords(void); const float *menu_display_get_tex_coords(void);
void menu_display_matrix_4x4_rotate_z(void *data, float rotation,
float scale_x, float scale_y, float scale_z, bool scale_enable);
unsigned menu_display_texture_load(void *data, unsigned menu_display_texture_load(void *data,
enum texture_filter_type filter_type); enum texture_filter_type filter_type);