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

(GL) Get rid of video_driver_build_info dependency

Browse Source
This commit is contained in:
twinaphex 2020-03-05 21:45:02 +01:00
parent 8d5d91a5a4
commit 52fae101e8
3 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gfx/drivers/gl.c
View File

@ -384,17 +384,18 @@ static void gl2_set_projection(gl_t *gl,
} }
static void gl2_set_viewport(gl_t *gl, static void gl2_set_viewport(gl_t *gl,
video_frame_info_t *video_info,
unsigned viewport_width, unsigned viewport_width,
unsigned viewport_height, unsigned viewport_height,
bool force_full, bool allow_rotate) bool force_full, bool allow_rotate)
{ {
gfx_ctx_aspect_t aspect_data; gfx_ctx_aspect_t aspect_data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned height = 0;
int x = 0; int x = 0;
int y = 0; int y = 0;
float device_aspect = (float)viewport_width / viewport_height; float device_aspect = (float)viewport_width / viewport_height;
unsigned height = video_info->height;
video_driver_get_size(NULL, &height);
aspect_data.aspect = &device_aspect; aspect_data.aspect = &device_aspect;
aspect_data.width = viewport_width; aspect_data.width = viewport_width;
@ -545,7 +546,7 @@ static void gl2_renderchain_render(
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
/* Render to FBO with certain size. */ /* Render to FBO with certain size. */
gl2_set_viewport(gl, video_info, gl2_set_viewport(gl,
rect->img_width, rect->img_height, true, false); rect->img_width, rect->img_height, true, false);
params.data = gl; params.data = gl;
@ -611,7 +612,7 @@ static void gl2_renderchain_render(
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
gl2_set_viewport(gl, video_info, gl2_set_viewport(gl,
width, height, false, true); width, height, false, true);
params.data = gl; params.data = gl;
@ -1029,7 +1030,7 @@ static void gl2_renderchain_start_render(
gl2_bind_fb(chain->fbo[0]); gl2_bind_fb(chain->fbo[0]);
gl2_set_viewport(gl, gl2_set_viewport(gl,
video_info, gl->fbo_rect[0].img_width, gl->fbo_rect[0].img_width,
gl->fbo_rect[0].img_height, true, false); gl->fbo_rect[0].img_height, true, false);
/* Need to preserve the "flipped" state when in FBO /* Need to preserve the "flipped" state when in FBO
@ -1909,12 +1910,8 @@ static void gl2_render_overlay(gl_t *gl, video_frame_info_t *video_info)
static void gl2_set_viewport_wrapper(void *data, unsigned viewport_width, static void gl2_set_viewport_wrapper(void *data, unsigned viewport_width,
unsigned viewport_height, bool force_full, bool allow_rotate) unsigned viewport_height, bool force_full, bool allow_rotate)
{ {
video_frame_info_t video_info;
gl_t *gl = (gl_t*)data; gl_t *gl = (gl_t*)data;
gl2_set_viewport(gl,
video_driver_build_info(&video_info);
gl2_set_viewport(gl, &video_info,
viewport_width, viewport_height, force_full, allow_rotate); viewport_width, viewport_height, force_full, allow_rotate);
} }
@ -2244,17 +2241,13 @@ static void gl2_init_textures(gl_t *gl, const video_info_t *video)
static INLINE void gl2_set_shader_viewports(gl_t *gl) static INLINE void gl2_set_shader_viewports(gl_t *gl)
{ {
unsigned i; unsigned i;
video_frame_info_t video_info;
unsigned width = gl->video_width; unsigned width = gl->video_width;
unsigned height = gl->video_height; unsigned height = gl->video_height;
video_driver_build_info(&video_info);
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
gl->shader->use(gl, gl->shader_data, i, true); gl->shader->use(gl, gl->shader_data, i, true);
gl2_set_viewport(gl, &video_info, gl2_set_viewport(gl, width, height, false, true);
width, height, false, true);
} }
} }
@ -2924,7 +2917,7 @@ static bool gl2_frame(void *data, const void *frame,
gl2_renderchain_start_render(gl, chain, video_info); gl2_renderchain_start_render(gl, chain, video_info);
} }
else else
gl2_set_viewport(gl, video_info, width, height, false, true); gl2_set_viewport(gl, width, height, false, true);
#ifdef HAVE_VIDEO_LAYOUT #ifdef HAVE_VIDEO_LAYOUT
gl->video_layout_resize = true; gl->video_layout_resize = true;
@ -2965,7 +2958,7 @@ static bool gl2_frame(void *data, const void *frame,
if (!gl->fbo_inited) if (!gl->fbo_inited)
{ {
gl2_renderchain_bind_backbuffer(); gl2_renderchain_bind_backbuffer();
gl2_set_viewport(gl, video_info, width, height, false, true); gl2_set_viewport(gl, width, height, false, true);
} }
gl2_renderchain_restore_default_state(gl); gl2_renderchain_restore_default_state(gl);

14
gfx/drivers/gl1.c
View File

@ -466,17 +466,18 @@ static void gl1_set_projection(gl1_t *gl1,
} }
void gl1_gfx_set_viewport(gl1_t *gl1, void gl1_gfx_set_viewport(gl1_t *gl1,
video_frame_info_t *video_info,
unsigned viewport_width, unsigned viewport_width,
unsigned viewport_height, unsigned viewport_height,
bool force_full, bool allow_rotate) bool force_full, bool allow_rotate)
{ {
gfx_ctx_aspect_t aspect_data; gfx_ctx_aspect_t aspect_data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned height = 0;
int x = 0; int x = 0;
int y = 0; int y = 0;
float device_aspect = (float)viewport_width / viewport_height; float device_aspect = (float)viewport_width / viewport_height;
unsigned height = video_info->height;
video_driver_get_size(NULL, &height);
aspect_data.aspect = &device_aspect; aspect_data.aspect = &device_aspect;
aspect_data.width = viewport_width; aspect_data.width = viewport_width;
@ -738,7 +739,8 @@ static bool gl1_gfx_frame(void *data, const void *frame,
video_info->cb_set_resize(video_info->context_data, video_info->cb_set_resize(video_info->context_data,
mode.width, mode.height); mode.width, mode.height);
gl1_gfx_set_viewport(gl1, video_info, video_info->width, video_info->height, false, true); gl1_gfx_set_viewport(gl1,
video_info->width, video_info->height, false, true);
} }
glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
@ -1422,12 +1424,8 @@ static bool gl1_gfx_widgets_enabled(void *data)
static void gl1_gfx_set_viewport_wrapper(void *data, unsigned viewport_width, static void gl1_gfx_set_viewport_wrapper(void *data, unsigned viewport_width,
unsigned viewport_height, bool force_full, bool allow_rotate) unsigned viewport_height, bool force_full, bool allow_rotate)
{ {
video_frame_info_t video_info;
gl1_t *gl1 = (gl1_t*)data; gl1_t *gl1 = (gl1_t*)data;
gl1_gfx_set_viewport(gl1,
video_driver_build_info(&video_info);
gl1_gfx_set_viewport(gl1, &video_info,
viewport_width, viewport_height, force_full, allow_rotate); viewport_width, viewport_height, force_full, allow_rotate);
} }

13
gfx/drivers/gl_core.c
View File

@ -762,17 +762,18 @@ static void gl_core_set_projection(gl_core_t *gl,
} }
static void gl_core_set_viewport(gl_core_t *gl, static void gl_core_set_viewport(gl_core_t *gl,
video_frame_info_t *video_info,
unsigned viewport_width, unsigned viewport_width,
unsigned viewport_height, unsigned viewport_height,
bool force_full, bool allow_rotate) bool force_full, bool allow_rotate)
{ {
gfx_ctx_aspect_t aspect_data; gfx_ctx_aspect_t aspect_data;
unsigned height = 0;
int x = 0; int x = 0;
int y = 0; int y = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
float device_aspect = (float)viewport_width / viewport_height; float device_aspect = (float)viewport_width / viewport_height;
unsigned height = video_info->height;
video_driver_get_size(NULL, &height);
aspect_data.aspect = &device_aspect; aspect_data.aspect = &device_aspect;
aspect_data.width = viewport_width; aspect_data.width = viewport_width;
@ -1144,12 +1145,8 @@ static void gl_core_set_viewport_wrapper(void *data,
unsigned viewport_width, unsigned viewport_width,
unsigned viewport_height, bool force_full, bool allow_rotate) unsigned viewport_height, bool force_full, bool allow_rotate)
{ {
video_frame_info_t video_info;
gl_core_t *gl = (gl_core_t*)data; gl_core_t *gl = (gl_core_t*)data;
gl_core_set_viewport(gl,
video_driver_build_info(&video_info);
gl_core_set_viewport(gl, &video_info,
viewport_width, viewport_height, force_full, allow_rotate); viewport_width, viewport_height, force_full, allow_rotate);
} }
@ -1868,7 +1865,7 @@ static bool gl_core_frame(void *data, const void *frame,
gl->should_resize = false; gl->should_resize = false;
} }
gl_core_set_viewport(gl, video_info, video_info->width, video_info->height, false, true); gl_core_set_viewport(gl, video_info->width, video_info->height, false, true);
texture.image = 0; texture.image = 0;
texture.width = streamed->width; texture.width = streamed->width;