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

Get rid of viewport_info callback function - was the same for both

Browse Source 
GL1 and GL2 renderchains
This commit is contained in:
twinaphex 2018-05-13 05:56:44 +02:00
parent 6996e72b49
commit 494ddb16d9
4 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/gl_common.h
View File

@ -196,8 +196,6 @@ typedef struct gl_renderchain_driver
void (*ff_matrix)(const void *data); void (*ff_matrix)(const void *data);
void (*bind_backbuffer)(void *data, void *chain_data); void (*bind_backbuffer)(void *data, void *chain_data);
void (*deinit_fbo)(gl_t *gl, 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)( bool (*read_viewport)(
gl_t *gl, void *chain_data, uint8_t *buffer, bool is_idle); gl_t *gl, void *chain_data, uint8_t *buffer, bool is_idle);
void (*bind_prev_texture)( void (*bind_prev_texture)(

16
gfx/drivers/gl.c
View File

@ -2237,10 +2237,20 @@ error:
static void gl_viewport_info(void *data, struct video_viewport *vp) 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; gl_t *gl = (gl_t*)data;
if (!gl->renderchain_driver || !gl->renderchain_driver->viewport_info)
return; video_driver_get_size(&width, &height);
gl->renderchain_driver->viewport_info(gl, gl->renderchain_data, vp);
*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) static bool gl_read_viewport(void *data, uint8_t *buffer, bool is_idle)

20
gfx/drivers_renderchain/gl1_renderchain.c
View File

@ -55,25 +55,6 @@ typedef struct gl1_renderchain
void *empty; void *empty;
} gl1_renderchain_t; } 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( static bool gl1_renderchain_read_viewport(
gl_t *gl, void *chain_data, gl_t *gl, void *chain_data,
uint8_t *buffer, bool is_idle) uint8_t *buffer, bool is_idle)
@ -304,7 +285,6 @@ gl_renderchain_driver_t gl1_renderchain = {
gl1_renderchain_ff_matrix, gl1_renderchain_ff_matrix,
NULL, /* bind_backbuffer */ NULL, /* bind_backbuffer */
NULL, /* deinit_fbo */ NULL, /* deinit_fbo */
gl1_renderchain_viewport_info,
gl1_renderchain_read_viewport, gl1_renderchain_read_viewport,
NULL, /* bind_prev_texture */ NULL, /* bind_prev_texture */
gl1_renderchain_free_internal, gl1_renderchain_free_internal,

20
gfx/drivers_renderchain/gl2_renderchain.c
View File

@ -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( static bool gl2_renderchain_read_viewport(
gl_t *gl, gl_t *gl,
void *chain_data, void *chain_data,
@ -1574,7 +1555,6 @@ gl_renderchain_driver_t gl2_renderchain = {
NULL, NULL,
gl2_renderchain_bind_backbuffer, gl2_renderchain_bind_backbuffer,
gl2_renderchain_deinit_fbo, gl2_renderchain_deinit_fbo,
gl2_renderchain_viewport_info,
gl2_renderchain_read_viewport, gl2_renderchain_read_viewport,
gl2_renderchain_bind_prev_texture, gl2_renderchain_bind_prev_texture,
gl2_renderchain_free_internal, gl2_renderchain_free_internal,