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

Remove gfx_display_get_coords_array

Browse Source
This commit is contained in:
twinaphex 2020-09-25 10:31:07 +02:00
parent 7d8518ec45
commit bc43db1789
12 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/common/metal/MenuDisplay.m
View File

@ -122,8 +122,9 @@
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_2:
{
video_coord_array_t *ca = gfx_display_get_coords_array();
draw->coords = (struct video_coords *)&ca->coords;
gfx_display_t *p_disp = disp_get_ptr();
video_coord_array_t *ca = &p_disp->dispca;
draw->coords = (struct video_coords *)&ca->coords;
break;
}

3
gfx/drivers_display/gfx_display_d3d10.c
View File

@ -194,7 +194,8 @@ static void gfx_display_d3d10_draw_pipeline(gfx_display_ctx_draw_t* draw,
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_2:
{
video_coord_array_t* ca = gfx_display_get_coords_array();
gfx_display_t *p_disp = disp_get_ptr();
video_coord_array_t* ca = &p_disp->dispca;
if (!d3d10->menu_pipeline_vbo)
{

3
gfx/drivers_display/gfx_display_d3d11.c
View File

@ -193,7 +193,8 @@ static void gfx_display_d3d11_draw_pipeline(gfx_display_ctx_draw_t *draw,
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_2:
{
video_coord_array_t* ca = gfx_display_get_coords_array();
gfx_display_t *p_disp = disp_get_ptr();
video_coord_array_t* ca = &p_disp->dispca;
if (!d3d11->menu_pipeline_vbo)
{

3
gfx/drivers_display/gfx_display_d3d12.c
View File

@ -210,7 +210,8 @@ static void gfx_display_d3d12_draw_pipeline(gfx_display_ctx_draw_t *draw,
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_2:
{
video_coord_array_t* ca = gfx_display_get_coords_array();
gfx_display_t *p_disp = disp_get_ptr();
video_coord_array_t* ca = &p_disp->dispca;
if (!d3d12->menu_pipeline_vbo)
{

3
gfx/drivers_display/gfx_display_d3d9.c
View File

@ -219,11 +219,12 @@ static void gfx_display_d3d9_draw_pipeline(gfx_display_ctx_draw_t *draw,
#if defined(HAVE_HLSL) || defined(HAVE_CG)
static float t = 0;
video_coord_array_t *ca = NULL;
gfx_display_t *p_disp = disp_get_ptr();
if (!draw)
return;
ca = gfx_display_get_coords_array();
ca = &p_disp->dispca;
draw->x = 0;
draw->y = 0;

3
gfx/drivers_display/gfx_display_gl.c
View File

@ -268,7 +268,8 @@ static void gfx_display_gl_draw_pipeline(
struct uniform_info uniform_param;
gl_t *gl = (gl_t*)data;
static float t = 0;
video_coord_array_t *ca = gfx_display_get_coords_array();
gfx_display_t *p_disp = disp_get_ptr();
video_coord_array_t *ca = &p_disp->dispca;
draw->x = 0;
draw->y = 0;

3
gfx/drivers_display/gfx_display_gl_core.c
View File

@ -84,6 +84,7 @@ static void gfx_display_gl_core_draw_pipeline(gfx_display_ctx_draw_t *draw,
static float t = 0.0f;
float yflip = 0.0f;
video_coord_array_t *ca = NULL;
gfx_display_t *p_disp = disp_get_ptr();
gl_core_t *gl = (gl_core_t*)data;
if (!gl || !draw)
@ -102,7 +103,7 @@ static void gfx_display_gl_core_draw_pipeline(gfx_display_ctx_draw_t *draw,
default:
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_2:
ca = gfx_display_get_coords_array();
ca = &p_disp->dispca;
draw->coords = (struct video_coords*)&ca->coords;
draw->backend_data = ubo_scratch_data;
draw->backend_data_size = 2 * sizeof(float);

3
gfx/drivers_display/gfx_display_vulkan.c
View File

@ -111,6 +111,7 @@ static void gfx_display_vk_draw_pipeline(gfx_display_ctx_draw_t *draw,
#ifdef HAVE_SHADERPIPELINE
static uint8_t ubo_scratch_data[768];
static float t = 0.0f;
gfx_display_t *p_disp = disp_get_ptr();
float yflip = 0.0f;
static struct video_coords blank_coords;
float output_size[2];
@ -133,7 +134,7 @@ static void gfx_display_vk_draw_pipeline(gfx_display_ctx_draw_t *draw,
default:
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_2:
ca = gfx_display_get_coords_array();
ca = &p_disp->dispca;
draw->coords = (struct video_coords*)&ca->coords;
draw->backend_data = ubo_scratch_data;
draw->backend_data_size = 2 * sizeof(float);

3
gfx/drivers_display/gfx_display_wiiu.c
View File

@ -216,6 +216,7 @@ static void gfx_display_wiiu_draw_pipeline(gfx_display_ctx_draw_t *draw,
void *data, unsigned video_width, unsigned video_height)
{
video_coord_array_t *ca = NULL;
gfx_display_t *p_disp = disp_get_ptr();
wiiu_video_t *wiiu = (wiiu_video_t*)data;
if (!wiiu || !draw)
@ -225,7 +226,7 @@ static void gfx_display_wiiu_draw_pipeline(gfx_display_ctx_draw_t *draw,
{
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_2:
ca = gfx_display_get_coords_array();
ca = &p_disp->dispca;
if (!wiiu->menu_shader_vbo)
{
wiiu->menu_shader_vbo = MEM2_alloc(ca->coords.vertices * 2 * sizeof(float), GX2_VERTEX_BUFFER_ALIGNMENT);

6
gfx/gfx_display.c
View File

@ -597,12 +597,6 @@ float gfx_display_get_widget_pixel_scale(
return adjusted_scale;
}
video_coord_array_t *gfx_display_get_coords_array(void)
{
gfx_display_t *p_disp = disp_get_ptr();
return &p_disp->dispca;
}
/* Reset the display's coordinate array vertices.
* NOTE: Not every display driver uses this. */
void gfx_display_coords_array_reset(void)

1
gfx/gfx_display.h
View File

@ -258,7 +258,6 @@ void gfx_display_scissor_end(void *data, unsigned width, unsigned height);
void gfx_display_font_free(font_data_t *font);
void gfx_display_coords_array_reset(void);
video_coord_array_t *gfx_display_get_coords_array(void);
void gfx_display_set_width(unsigned width);
void gfx_display_get_fb_size(unsigned *fb_width, unsigned *fb_height,

3
menu/drivers/xmb.c
View File

@ -5490,7 +5490,8 @@ static void xmb_init_ribbon(xmb_handle_t * xmb)
video_coords_t coords;
unsigned r, c, col;
unsigned i = 0;
video_coord_array_t *ca = gfx_display_get_coords_array();
gfx_display_t *p_disp = disp_get_ptr();
video_coord_array_t *ca = &p_disp->dispca;
unsigned vertices_total = XMB_RIBBON_VERTICES;
float *dummy = (float*)calloc(4 * vertices_total, sizeof(float));
float *ribbon_verts = (float*)calloc(2 * vertices_total, sizeof(float));