Revert "Simplify video_driver_set_mvp"

This reverts commit 1dd89e1bce.
This commit is contained in:
twinaphex 2019-02-03 19:40:48 +01:00
parent 4aadd53d80
commit 4cbbd3470b
2 changed files with 8 additions and 7 deletions

View File

@ -4087,11 +4087,6 @@ static float gl_get_refresh_rate(void *data)
static void gl_set_mvp(void *data, void *shader_data,
const void *mat_data)
{
gl_t *gl = (gl_t*)data;
if (gl->shader && gl->shader->set_mvp)
gl->shader->set_mvp(gl, gl->shader_data,
mat_data);
}
static uint32_t gl_get_flags(void *data)

View File

@ -3614,9 +3614,15 @@ void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp)
if (!mvp || !mvp->matrix)
return;
if (video_driver_poke && video_driver_poke->set_mvp)
video_driver_poke->set_mvp(mvp->data,
if (current_shader && current_shader->set_mvp)
current_shader->set_mvp(mvp->data,
current_shader_data, mvp->matrix);
else
{
if (video_driver_poke && video_driver_poke->set_mvp)
video_driver_poke->set_mvp(mvp->data,
current_shader_data, mvp->matrix);
}
}
float video_driver_get_refresh_rate(void)