From 4cbbd3470be895e53ee9ff5f485319c7e616c2e4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 3 Feb 2019 19:40:48 +0100 Subject: [PATCH] Revert "Simplify video_driver_set_mvp" This reverts commit 1dd89e1bcee6b8c39e78e6228c6c3d411ddb3eae. --- gfx/drivers/gl.c | 5 ----- gfx/video_driver.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 1041007970..a019006d02 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -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) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 0e012e3c76..4ef0611f4a 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -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)