mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Get rid of video_shader_driver_scale"

Browse Source 
This reverts commit 256b28fa2af06a915ee28428d44f2b1250c638a2.
This commit is contained in:
twinaphex 2019-02-03 19:40:36 +01:00
parent 1eeb58c5dd
commit 4aadd53d80
3 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gfx/drivers/gl.c
View File

@ -1099,24 +1099,17 @@ static void gl2_renderchain_init(
video_driver_get_size(&width, &height); video_driver_get_size(&width, &height);
scale.valid = false; scaler.idx = 1;
scaler.idx = 1; scaler.scale = &scale;
scaler.scale = &scale;
if (gl->shader->shader_scale) video_shader_driver_scale(&scaler);
gl->shader->shader_scale(gl->shader_data,
1, scaler.scale);
scale_last.valid = false; scaler.idx = shader_info.num;
scaler.idx = shader_info.num; scaler.scale = &scale_last;
scaler.scale = &scale_last;
if (gl->shader->shader_scale) video_shader_driver_scale(&scaler);
gl->shader->shader_scale(gl->shader_data,
shader_info.num, scaler.scale);
/* we always want FBO to be at least initialized /* we always want FBO to be at least initialized on startup for consoles */
* on startup for consoles */
if (shader_info.num == 1 && !scale.valid) if (shader_info.num == 1 && !scale.valid)
return; return;
@ -1142,13 +1135,10 @@ static void gl2_renderchain_init(
for (i = 1; i < chain->fbo_pass; i++) for (i = 1; i < chain->fbo_pass; i++)
{ {
chain->fbo_scale[i].valid = false; scaler.idx = i + 1;
scaler.idx = i + 1; scaler.scale = &chain->fbo_scale[i];
scaler.scale = &chain->fbo_scale[i];
if (gl->shader->shader_scale) video_shader_driver_scale(&scaler);
gl->shader->shader_scale(gl->shader_data,
i + 1, scaler.scale);
if (!chain->fbo_scale[i].valid) if (!chain->fbo_scale[i].valid)
{ {

22
gfx/video_driver.c
View File

@ -3502,6 +3502,13 @@ static bool video_driver_cb_set_mvp(void *data,
return true; return true;
} }
static void video_shader_driver_scale_null(void *data,
unsigned idx, struct gfx_fbo_scale *scale)
{
(void)idx;
(void)scale;
}
static void video_shader_driver_reset_to_defaults(void) static void video_shader_driver_reset_to_defaults(void)
{ {
if (!current_shader) if (!current_shader)
@ -3516,6 +3523,9 @@ static void video_shader_driver_reset_to_defaults(void)
} }
if (!current_shader->set_coords) if (!current_shader->set_coords)
current_shader->set_coords = video_driver_cb_set_coords; current_shader->set_coords = video_driver_cb_set_coords;
if (!current_shader->shader_scale)
current_shader->shader_scale = video_shader_driver_scale_null;
} }
/* Finds first suitable shader context driver. */ /* Finds first suitable shader context driver. */
@ -3562,6 +3572,18 @@ bool video_shader_driver_init(video_shader_ctx_init_t *init)
return true; return true;
} }
bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
{
if (!scaler || !scaler->scale)
return false;
scaler->scale->valid = false;
current_shader->shader_scale(current_shader_data,
scaler->idx, scaler->scale);
return true;
}
bool video_shader_driver_info(video_shader_ctx_info_t *shader_info) bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
{ {
if (!shader_info) if (!shader_info)

2
gfx/video_driver.h
View File

@ -1192,6 +1192,8 @@ bool video_shader_driver_init(video_shader_ctx_init_t *init);
void video_driver_set_coords(video_shader_ctx_coords_t *coords); void video_driver_set_coords(video_shader_ctx_coords_t *coords);
bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler);
bool video_shader_driver_info(video_shader_ctx_info_t *shader_info); bool video_shader_driver_info(video_shader_ctx_info_t *shader_info);
void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp); void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp);