mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nits

Browse Source
This commit is contained in:
twinaphex 2018-02-26 15:12:19 +01:00
parent b4733fd6c2
commit 5665e27324
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx/video_driver.c
View File

@ -768,7 +768,8 @@ static void video_driver_init_input(const input_driver_t *tmp)
/* Video driver didn't provide an input driver, /* Video driver didn't provide an input driver,
* so we use configured one. */ * so we use configured one. */
RARCH_LOG("[Video]: Graphics driver did not initialize an input driver. Attempting to pick a suitable driver.\n"); RARCH_LOG("[Video]: Graphics driver did not initialize an input driver."
" Attempting to pick a suitable driver.\n");
if (tmp) if (tmp)
*input = tmp; *input = tmp;
@ -804,14 +805,16 @@ static void video_driver_monitor_compute_fps_statistics(void)
(2 * MEASURE_FRAME_TIME_SAMPLES_COUNT)) (2 * MEASURE_FRAME_TIME_SAMPLES_COUNT))
{ {
RARCH_LOG( RARCH_LOG(
"[Video]: Does not have enough samples for monitor refresh rate estimation. Requires to run for at least %u frames.\n", "[Video]: Does not have enough samples for monitor refresh rate"
" estimation. Requires to run for at least %u frames.\n",
2 * MEASURE_FRAME_TIME_SAMPLES_COUNT); 2 * MEASURE_FRAME_TIME_SAMPLES_COUNT);
return; return;
} }
if (video_monitor_fps_statistics(&avg_fps, &stddev, &samples)) if (video_monitor_fps_statistics(&avg_fps, &stddev, &samples))
{ {
RARCH_LOG("[Video]: Average monitor Hz: %.6f Hz. (%.3f %% frame time deviation, based on %u last samples).\n", RARCH_LOG("[Video]: Average monitor Hz: %.6f Hz. (%.3f %% frame time"
" deviation, based on %u last samples).\n",
avg_fps, 100.0 * stddev, samples); avg_fps, 100.0 * stddev, samples);
} }
} }
@ -3247,7 +3250,8 @@ static const shader_backend_t *video_shader_set_backend(enum rarch_shader_type t
if (BIT32_GET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT)) if (BIT32_GET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT))
{ {
RARCH_ERR("[Shader driver]: Cg cannot be used with core GL context. Trying to fall back to GLSL...\n"); RARCH_ERR("[Shader driver]: Cg cannot be used with core"
" GL context. Trying to fall back to GLSL...\n");
return video_shader_set_backend(RARCH_SHADER_GLSL); return video_shader_set_backend(RARCH_SHADER_GLSL);
} }
@ -3343,7 +3347,8 @@ static struct video_shader *video_shader_driver_get_current_shader_null(void *da
return NULL; return NULL;
} }
static void video_shader_driver_set_params_null(void *data, void *shader_data, static void video_shader_driver_set_params_null(
void *data, void *shader_data,
unsigned width, unsigned height, unsigned width, unsigned height,
unsigned tex_width, unsigned tex_height, unsigned tex_width, unsigned tex_height,
unsigned out_width, unsigned out_height, unsigned out_width, unsigned out_height,
@ -3515,11 +3520,13 @@ bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap)
void video_driver_set_coords(video_shader_ctx_coords_t *coords) void video_driver_set_coords(video_shader_ctx_coords_t *coords)
{ {
if (current_shader && current_shader->set_coords) if (current_shader && current_shader->set_coords)
current_shader->set_coords(coords->handle_data, shader_data, (const struct video_coords*)coords->data); current_shader->set_coords(coords->handle_data,
shader_data, (const struct video_coords*)coords->data);
else else
{ {
if (video_driver_poke && video_driver_poke->set_coords) if (video_driver_poke && video_driver_poke->set_coords)
video_driver_poke->set_coords(coords->handle_data, shader_data, (const struct video_coords*)coords->data); video_driver_poke->set_coords(coords->handle_data,
shader_data, (const struct video_coords*)coords->data);
} }
} }

9
gfx/video_shader_parse.c
View File

@ -86,7 +86,8 @@ static enum gfx_wrap_type wrap_str_to_mode(const char *wrap_mode)
else if (string_is_equal(wrap_mode, "mirrored_repeat")) else if (string_is_equal(wrap_mode, "mirrored_repeat"))
return RARCH_WRAP_MIRRORED_REPEAT; return RARCH_WRAP_MIRRORED_REPEAT;
RARCH_WARN("Invalid wrapping type %s. Valid ones are: clamp_to_border (default), clamp_to_edge, repeat and mirrored_repeat. Falling back to default.\n", RARCH_WARN("Invalid wrapping type %s. Valid ones are: clamp_to_border"
" (default), clamp_to_edge, repeat and mirrored_repeat. Falling back to default.\n",
wrap_mode); wrap_mode);
return RARCH_WRAP_DEFAULT; return RARCH_WRAP_DEFAULT;
} }
@ -452,7 +453,8 @@ bool video_shader_resolve_current_parameters(config_file_t *conf,
if (!parameter) if (!parameter)
{ {
RARCH_WARN("[CGP/GLSLP]: Parameter %s is set in the preset, but no shader uses this parameter, ignoring.\n", id); RARCH_WARN("[CGP/GLSLP]: Parameter %s is set in the preset,"
" but no shader uses this parameter, ignoring.\n", id);
continue; continue;
} }
@ -701,10 +703,10 @@ bool video_shader_read_conf_cgp(config_file_t *conf,
struct video_shader *shader) struct video_shader *shader)
{ {
unsigned i; unsigned i;
union string_list_elem_attr attr;
unsigned shaders = 0; unsigned shaders = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
struct string_list *file_list = NULL; struct string_list *file_list = NULL;
union string_list_elem_attr attr = {0};
(void)file_list; (void)file_list;
@ -728,6 +730,7 @@ bool video_shader_read_conf_cgp(config_file_t *conf,
shader->feedback_pass = -1; shader->feedback_pass = -1;
shader->passes = MIN(shaders, GFX_MAX_SHADERS); shader->passes = MIN(shaders, GFX_MAX_SHADERS);
attr.i = 0;
if (settings->bools.video_shader_watch_files) if (settings->bools.video_shader_watch_files)
{ {