diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h index 833fd1d3f0..8da6c19cb6 100644 --- a/gfx/common/gl_common.h +++ b/gfx/common/gl_common.h @@ -196,8 +196,6 @@ typedef struct gl_renderchain_driver void (*ff_matrix)(const void *data); void (*bind_backbuffer)(void *data, void *chain_data); void (*deinit_fbo)(gl_t *gl, void *chain_data); - void (*viewport_info)( - gl_t *gl, void *chain_data, struct video_viewport *vp); bool (*read_viewport)( gl_t *gl, void *chain_data, uint8_t *buffer, bool is_idle); void (*bind_prev_texture)( diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 34b781fad3..9b0daff631 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -2237,10 +2237,20 @@ error: static void gl_viewport_info(void *data, struct video_viewport *vp) { + unsigned width, height; + unsigned top_y, top_dist; gl_t *gl = (gl_t*)data; - if (!gl->renderchain_driver || !gl->renderchain_driver->viewport_info) - return; - gl->renderchain_driver->viewport_info(gl, gl->renderchain_data, vp); + + video_driver_get_size(&width, &height); + + *vp = gl->vp; + vp->full_width = width; + vp->full_height = height; + + /* Adjust as GL viewport is bottom-up. */ + top_y = vp->y + vp->height; + top_dist = height - top_y; + vp->y = top_dist; } static bool gl_read_viewport(void *data, uint8_t *buffer, bool is_idle) diff --git a/gfx/drivers_renderchain/gl1_renderchain.c b/gfx/drivers_renderchain/gl1_renderchain.c index fe7515f724..17f9dfe054 100644 --- a/gfx/drivers_renderchain/gl1_renderchain.c +++ b/gfx/drivers_renderchain/gl1_renderchain.c @@ -55,25 +55,6 @@ typedef struct gl1_renderchain void *empty; } gl1_renderchain_t; -static void gl1_renderchain_viewport_info( - gl_t *gl, void *chain_data, - struct video_viewport *vp) -{ - unsigned width, height; - unsigned top_y, top_dist; - - video_driver_get_size(&width, &height); - - *vp = gl->vp; - vp->full_width = width; - vp->full_height = height; - - /* Adjust as GL viewport is bottom-up. */ - top_y = vp->y + vp->height; - top_dist = height - top_y; - vp->y = top_dist; -} - static bool gl1_renderchain_read_viewport( gl_t *gl, void *chain_data, uint8_t *buffer, bool is_idle) @@ -304,7 +285,6 @@ gl_renderchain_driver_t gl1_renderchain = { gl1_renderchain_ff_matrix, NULL, /* bind_backbuffer */ NULL, /* deinit_fbo */ - gl1_renderchain_viewport_info, gl1_renderchain_read_viewport, NULL, /* bind_prev_texture */ gl1_renderchain_free_internal, diff --git a/gfx/drivers_renderchain/gl2_renderchain.c b/gfx/drivers_renderchain/gl2_renderchain.c index 13cf4b2799..94d03d40a1 100644 --- a/gfx/drivers_renderchain/gl2_renderchain.c +++ b/gfx/drivers_renderchain/gl2_renderchain.c @@ -1069,25 +1069,6 @@ static void gl2_renderchain_bind_prev_texture( } } -static void gl2_renderchain_viewport_info( - gl_t *gl, void *chain_data, - struct video_viewport *vp) -{ - unsigned width, height; - unsigned top_y, top_dist; - - video_driver_get_size(&width, &height); - - *vp = gl->vp; - vp->full_width = width; - vp->full_height = height; - - /* Adjust as GL viewport is bottom-up. */ - top_y = vp->y + vp->height; - top_dist = height - top_y; - vp->y = top_dist; -} - static bool gl2_renderchain_read_viewport( gl_t *gl, void *chain_data, @@ -1574,7 +1555,6 @@ gl_renderchain_driver_t gl2_renderchain = { NULL, gl2_renderchain_bind_backbuffer, gl2_renderchain_deinit_fbo, - gl2_renderchain_viewport_info, gl2_renderchain_read_viewport, gl2_renderchain_bind_prev_texture, gl2_renderchain_free_internal,