libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-12 20:58:18 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Merge menu_video.c and menu_display.c

Browse Source
This commit is contained in:
twinaphex 2015-10-18 07:15:54 +02:00
parent 04ae499e89
commit 38c66f62d0
13 changed files with 122 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -415,7 +415,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/menu_navigation.o \
menu/menu_setting.o \
menu/menu_shader.o \
menu/menu_video.o \
menu/menu_cbs.o \
menu/cbs/menu_cbs_ok.o \
menu/cbs/menu_cbs_cancel.o \

1
griffin/griffin.c
View File

@ -767,7 +767,6 @@ MENU
#include "../menu/menu_entries.c"
#include "../menu/menu_setting.c"
#include "../menu/menu_cbs.c"
#include "../menu/menu_video.c"
#include "../menu/cbs/menu_cbs_ok.c"
#include "../menu/cbs/menu_cbs_cancel.c"
#include "../menu/cbs/menu_cbs_select.c"

1
menu/drivers/glui.c
View File

@ -32,7 +32,6 @@
#include "../menu_animation.h"
#include "../menu_hash.h"
#include "../menu_display.h"
#include "../menu_video.h"
#include "../../gfx/video_texture.h"

1
menu/drivers/rgui.c
View File

@ -34,7 +34,6 @@
#include "../menu_animation.h"
#include "../menu_display.h"
#include "../menu_hash.h"
#include "../menu_video.h"
#include "../../gfx/drivers_font_renderer/bitmap.h"

2
menu/drivers/rmenu.c
View File

@ -31,7 +31,7 @@
#include "../menu_entry.h"
#include "../menu_input.h"
#include "../menu_setting.h"
#include "../menu_video.h"
#include "../menu_display.h"
#include "../../general.h"
#include "../../config.def.h"
#include "../../performance.h"

2
menu/drivers/rmenu_xui.cpp
View File

@ -35,7 +35,7 @@
#include "../menu_entries.h"
#include "../menu_input.h"
#include "../menu_setting.h"
#include "../menu_video.h"
#include "../menu_display.h"
#include "../../gfx/video_context_driver.h"

2
menu/drivers/xmb.c
View File

@ -33,7 +33,7 @@
#include "../menu_animation.h"
#include "../menu_display.h"
#include "../menu_hash.h"
#include "../menu_video.h"
#include "../menu_display.h"
#include "../menu_cbs.h"

1
menu/drivers/zarch.c
View File

@ -40,7 +40,6 @@
#include "../../gfx/video_thread_wrapper.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/video_texture.h"
#include "../menu_video.h"
const GLfloat ZUI_NORMAL[] = {
1, 1, 1, 1,

89
menu/menu_display.c
View File

@ -16,6 +16,7 @@
#include <time.h>
#include <queues/message_queue.h>
#include <retro_miscellaneous.h>
#include "../config.def.h"
#include "../gfx/font_renderer_driver.h"
@ -26,6 +27,10 @@
#include "menu_animation.h"
#include "menu_display.h"
#ifdef HAVE_THREADS
#include "../gfx/video_thread_wrapper.h"
#endif
typedef struct menu_framebuf
{
uint16_t *data;
@ -476,3 +481,87 @@ void menu_display_msg_queue_push(const char *msg, unsigned prio, unsigned durati
{
rarch_main_msg_queue_push(msg, prio, duration, flush);
}
#ifdef HAVE_OPENGL
void menu_video_draw_frame(
unsigned x, unsigned y,
unsigned width, unsigned height,
const void *shader_data,
struct gfx_coords *coords,
math_matrix_4x4 *mat,
bool blend,
GLuint texture
)
{
const shader_backend_t *shader = (const shader_backend_t*)shader_data;
driver_t *driver = driver_get_ptr();
glViewport(x, y, width, height);
glBindTexture(GL_TEXTURE_2D, texture);
shader->set_coords(coords);
shader->set_mvp(driver->video_data, mat);
if (blend)
glEnable(GL_BLEND);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
if (blend)
glDisable(GL_BLEND);
}
void menu_video_frame_background(
menu_handle_t *menu,
settings_t *settings,
gl_t *gl,
unsigned width,
unsigned height,
GLuint texture,
float handle_alpha,
bool force_transparency,
GRfloat *coord_color,
GRfloat *coord_color2,
const GRfloat *vertex,
const GRfloat *tex_coord)
{
struct gfx_coords coords;
global_t *global = global_get_ptr();
coords.vertices = 4;
coords.vertex = vertex;
coords.tex_coord = tex_coord;
coords.lut_tex_coord = tex_coord;
coords.color = (const float*)coord_color;
if (gl->shader && gl->shader->use)
gl->shader->use(gl, GL_SHADER_STOCK_BLEND);
menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL);
if ((settings->menu.pause_libretro
|| !global->inited.main || (global->inited.core.type == CORE_TYPE_DUMMY))
&& !force_transparency
&& texture)
coords.color = (const float*)coord_color2;
menu_video_draw_frame(0, 0, width, height,
gl->shader, &coords,
&gl->mvp_no_rot, true, texture);
gl->coords.color = gl->white_color_ptr;
}
#endif
const char *menu_video_get_ident(void)
{
#ifdef HAVE_THREADS
settings_t *settings = config_get_ptr();
if (settings->video.threaded)
return rarch_threaded_video_get_ident();
#endif
return video_driver_get_ident();
}

29
menu/menu_display.h
View File

@ -80,6 +80,35 @@ void menu_display_timedate(char *s, size_t len, unsigned time_mode);
void menu_display_msg_queue_push(const char *msg, unsigned prio, unsigned duration,
bool flush);
#ifdef HAVE_OPENGL
#include "../gfx/drivers/gl_common.h"
void menu_video_draw_frame(
unsigned x, unsigned y,
unsigned width, unsigned height,
const void *shader,
struct gfx_coords *coords,
math_matrix_4x4 *mat,
bool blend,
GLuint texture
);
void menu_video_frame_background(
menu_handle_t *menu,
settings_t *settings,
gl_t *gl,
unsigned width, unsigned height,
GLuint texture,
float handle_alpha,
bool force_transparency,
GRfloat *color,
GRfloat *color2,
const GRfloat *vertex,
const GRfloat *tex_coord);
#endif
const char *menu_video_get_ident(void);
#ifdef __cplusplus
}
#endif

2
menu/menu_driver.c
View File

@ -18,7 +18,7 @@
#include <string/string_list.h>
#include "menu.h"
#include "menu_video.h"
#include "menu_display.h"
#include "../general.h"
static bool menu_alive = false;

106
menu/menu_video.c
View File

@ -1,106 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2015 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <retro_miscellaneous.h>
#include "menu_display.h"
#include "menu_video.h"
#ifdef HAVE_THREADS
#include "../gfx/video_thread_wrapper.h"
#endif
#ifdef HAVE_OPENGL
void menu_video_draw_frame(
unsigned x, unsigned y,
unsigned width, unsigned height,
const shader_backend_t *shader,
struct gfx_coords *coords,
math_matrix_4x4 *mat,
bool blend,
GLuint texture
)
{
driver_t *driver = driver_get_ptr();
glViewport(x, y, width, height);
glBindTexture(GL_TEXTURE_2D, texture);
shader->set_coords(coords);
shader->set_mvp(driver->video_data, mat);
if (blend)
glEnable(GL_BLEND);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
if (blend)
glDisable(GL_BLEND);
}
void menu_video_frame_background(
menu_handle_t *menu,
settings_t *settings,
gl_t *gl,
unsigned width,
unsigned height,
GLuint texture,
float handle_alpha,
bool force_transparency,
GRfloat *coord_color,
GRfloat *coord_color2,
const GRfloat *vertex,
const GRfloat *tex_coord)
{
struct gfx_coords coords;
global_t *global = global_get_ptr();
coords.vertices = 4;
coords.vertex = vertex;
coords.tex_coord = tex_coord;
coords.lut_tex_coord = tex_coord;
coords.color = (const float*)coord_color;
if (gl->shader && gl->shader->use)
gl->shader->use(gl, GL_SHADER_STOCK_BLEND);
menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL);
if ((settings->menu.pause_libretro
|| !global->inited.main || (global->inited.core.type == CORE_TYPE_DUMMY))
&& !force_transparency
&& texture)
coords.color = (const float*)coord_color2;
menu_video_draw_frame(0, 0, width, height,
gl->shader, &coords,
&gl->mvp_no_rot, true, texture);
gl->coords.color = gl->white_color_ptr;
}
#endif
const char *menu_video_get_ident(void)
{
#ifdef HAVE_THREADS
settings_t *settings = config_get_ptr();
if (settings->video.threaded)
return rarch_threaded_video_get_ident();
#endif
return video_driver_get_ident();
}

59
menu/menu_video.h
View File

@ -1,59 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2015 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _MENU_VIDEO_H
#define _MENU_VIDEO_H
#include "menu_shader.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef HAVE_OPENGL
#include "../gfx/drivers/gl_common.h"
void menu_video_draw_frame(
unsigned x, unsigned y,
unsigned width, unsigned height,
const shader_backend_t *shader,
struct gfx_coords *coords,
math_matrix_4x4 *mat,
bool blend,
GLuint texture
);
void menu_video_frame_background(
menu_handle_t *menu,
settings_t *settings,
gl_t *gl,
unsigned width, unsigned height,
GLuint texture,
float handle_alpha,
bool force_transparency,
GRfloat *color,
GRfloat *color2,
const GRfloat *vertex,
const GRfloat *tex_coord);
#endif
const char *menu_video_get_ident(void);
#ifdef __cplusplus
}
#endif
#endif