From bc43db178958d501700dbd2ee0c567c7649de316 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 25 Sep 2020 10:31:07 +0200 Subject: [PATCH] Remove gfx_display_get_coords_array --- gfx/common/metal/MenuDisplay.m | 5 +++-- gfx/drivers_display/gfx_display_d3d10.c | 3 ++- gfx/drivers_display/gfx_display_d3d11.c | 3 ++- gfx/drivers_display/gfx_display_d3d12.c | 3 ++- gfx/drivers_display/gfx_display_d3d9.c | 3 ++- gfx/drivers_display/gfx_display_gl.c | 3 ++- gfx/drivers_display/gfx_display_gl_core.c | 3 ++- gfx/drivers_display/gfx_display_vulkan.c | 3 ++- gfx/drivers_display/gfx_display_wiiu.c | 3 ++- gfx/gfx_display.c | 6 ------ gfx/gfx_display.h | 1 - menu/drivers/xmb.c | 3 ++- 12 files changed, 21 insertions(+), 18 deletions(-) diff --git a/gfx/common/metal/MenuDisplay.m b/gfx/common/metal/MenuDisplay.m index 848e8f84df..cc5024c5a8 100644 --- a/gfx/common/metal/MenuDisplay.m +++ b/gfx/common/metal/MenuDisplay.m @@ -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; } diff --git a/gfx/drivers_display/gfx_display_d3d10.c b/gfx/drivers_display/gfx_display_d3d10.c index 7a6826a895..fd32b935b3 100644 --- a/gfx/drivers_display/gfx_display_d3d10.c +++ b/gfx/drivers_display/gfx_display_d3d10.c @@ -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) { diff --git a/gfx/drivers_display/gfx_display_d3d11.c b/gfx/drivers_display/gfx_display_d3d11.c index 02cf3f4292..e9965f1f92 100644 --- a/gfx/drivers_display/gfx_display_d3d11.c +++ b/gfx/drivers_display/gfx_display_d3d11.c @@ -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) { diff --git a/gfx/drivers_display/gfx_display_d3d12.c b/gfx/drivers_display/gfx_display_d3d12.c index 219651ecf4..0a06ccdfb5 100644 --- a/gfx/drivers_display/gfx_display_d3d12.c +++ b/gfx/drivers_display/gfx_display_d3d12.c @@ -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) { diff --git a/gfx/drivers_display/gfx_display_d3d9.c b/gfx/drivers_display/gfx_display_d3d9.c index 8cdfd1991c..73c3490fd4 100644 --- a/gfx/drivers_display/gfx_display_d3d9.c +++ b/gfx/drivers_display/gfx_display_d3d9.c @@ -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; diff --git a/gfx/drivers_display/gfx_display_gl.c b/gfx/drivers_display/gfx_display_gl.c index 9353ab2130..cbfcc1ae65 100644 --- a/gfx/drivers_display/gfx_display_gl.c +++ b/gfx/drivers_display/gfx_display_gl.c @@ -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; diff --git a/gfx/drivers_display/gfx_display_gl_core.c b/gfx/drivers_display/gfx_display_gl_core.c index 321f8dc826..a6752afcfc 100644 --- a/gfx/drivers_display/gfx_display_gl_core.c +++ b/gfx/drivers_display/gfx_display_gl_core.c @@ -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); diff --git a/gfx/drivers_display/gfx_display_vulkan.c b/gfx/drivers_display/gfx_display_vulkan.c index 9385a46bd5..0d41ed057a 100644 --- a/gfx/drivers_display/gfx_display_vulkan.c +++ b/gfx/drivers_display/gfx_display_vulkan.c @@ -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); diff --git a/gfx/drivers_display/gfx_display_wiiu.c b/gfx/drivers_display/gfx_display_wiiu.c index e467d45a82..994d0d620c 100644 --- a/gfx/drivers_display/gfx_display_wiiu.c +++ b/gfx/drivers_display/gfx_display_wiiu.c @@ -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); diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c index 6bd71e56cf..9fd3a56197 100644 --- a/gfx/gfx_display.c +++ b/gfx/gfx_display.c @@ -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) diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h index eaaafe83f5..a6918c8e84 100644 --- a/gfx/gfx_display.h +++ b/gfx/gfx_display.h @@ -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, diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index c5f1c63d8c..3969b10a79 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -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));