From 7b88378952a9fd21c51f991a42bb5621c59b3086 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 16 Apr 2016 05:14:39 +0200 Subject: [PATCH] Add params to video_shader_ctx_init --- gfx/drivers/gl.c | 2 ++ gfx/video_shader_driver.c | 9 ++++++++- gfx/video_shader_driver.h | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 8d4a674ed1..46b4ca3132 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -291,6 +291,8 @@ static bool gl_shader_init(gl_t *gl) backend = &gl_glsl_backend; shader_path = NULL; } + + init_data.gl.core_context_enabled = gl->core_context; #endif #endif diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c index b2d0e3176a..812ae42c83 100644 --- a/gfx/video_shader_driver.c +++ b/gfx/video_shader_driver.c @@ -137,7 +137,14 @@ bool video_shader_driver_ctl(enum video_shader_driver_ctl_state state, void *dat void *tmp = NULL; if (!init->shader || !init->shader->init) - return false; + { + switch (init->shader_type) + { + case RARCH_SHADER_NONE: + default: + return false; + } + } tmp = init->shader->init(init->data, init->path); diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h index 656d533897..b3a860947e 100644 --- a/gfx/video_shader_driver.h +++ b/gfx/video_shader_driver.h @@ -183,7 +183,12 @@ typedef struct shader_backend typedef struct video_shader_ctx_init { + enum rarch_shader_type shader_type; const shader_backend_t *shader; + struct + { + bool core_context_enabled; + } gl; void *data; const char *path; } video_shader_ctx_init_t;