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

Logging cleanups (#13320)

Browse Source
This commit is contained in:
Tony 2021-12-04 15:21:12 +02:00 committed by GitHub
parent bf9706395d
commit 09880e92d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 119 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/d3d12_common.c
View File

@ -203,7 +203,7 @@ bool d3d12_init_base(d3d12_video_t* d3d12)
utf16_to_char_string((const uint16_t*)desc.Description, str, sizeof(str));
RARCH_LOG("[D3D12]: Found GPU at index %d: %s\n", i, str);
RARCH_LOG("[D3D12]: Found GPU at index %d: \"%s\".\n", i, str);
string_list_append(d3d12->gpu_list, str, attr);

6
gfx/common/vulkan_common.c
View File

@ -1561,7 +1561,7 @@ static bool vulkan_context_init_gpu(gfx_ctx_vulkan_data_t *vk)
vkGetPhysicalDeviceProperties(gpus[i],
&gpu_properties);
RARCH_LOG("[Vulkan]: Found GPU at index %d: %s\n", i, gpu_properties.deviceName);
RARCH_LOG("[Vulkan]: Found GPU at index %d: \"%s\".\n", i, gpu_properties.deviceName);
string_list_append(vk->gpu_list, gpu_properties.deviceName, attr);
}
@ -1693,7 +1693,7 @@ static bool vulkan_context_init_device(gfx_ctx_vulkan_data_t *vk)
}
}
RARCH_LOG("[Vulkan]: Using GPU: %s\n", vk->context.gpu_properties.deviceName);
RARCH_LOG("[Vulkan]: Using GPU: \"%s\".\n", vk->context.gpu_properties.deviceName);
{
char device_str[128];
@ -3113,7 +3113,7 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
}
#ifdef VULKAN_DEBUG
RARCH_LOG("[Vulkan]: Using swapchain size %u x %u.\n",
RARCH_LOG("[Vulkan]: Using swapchain size %ux%u.\n",
swapchain_size.width, swapchain_size.height);
#endif

4
gfx/drivers/d3d10.c
View File

@ -1046,7 +1046,7 @@ static void *d3d10_gfx_init(const video_info_t* video,
utf16_to_char_string((const uint16_t*)
desc.Description, str, sizeof(str));
RARCH_LOG("[D3D10]: Found GPU at index %d: %s\n", i, str);
RARCH_LOG("[D3D10]: Found GPU at index %d: \"%s\".\n", i, str);
string_list_append(d3d10->gpu_list, str, attr);
@ -1163,7 +1163,7 @@ static void d3d10_init_render_targets(d3d10_video_t* d3d10,
height = d3d10->vp.height;
}
RARCH_LOG("[D3D10]: Updating framebuffer size %u x %u.\n", width, height);
RARCH_LOG("[D3D10]: Updating framebuffer size %ux%u.\n", width, height);
if ((i != (d3d10->shader_preset->passes - 1)) || (width != d3d10->vp.width) ||
(height != d3d10->vp.height))

4
gfx/drivers/d3d11.c
View File

@ -1498,7 +1498,7 @@ static void *d3d11_gfx_init(const video_info_t* video,
utf16_to_char_string((const uint16_t*)
desc.Description, str, sizeof(str));
RARCH_LOG("[D3D11]: Found GPU at index %d: %s\n", i, str);
RARCH_LOG("[D3D11]: Found GPU at index %d: \"%s\".\n", i, str);
string_list_append(d3d11->gpu_list, str, attr);
@ -1625,7 +1625,7 @@ static void d3d11_init_render_targets(d3d11_video_t* d3d11, unsigned width, unsi
height = d3d11->vp.height;
}
RARCH_LOG("[D3D11]: Updating framebuffer size %u x %u.\n", width, height);
RARCH_LOG("[D3D11]: Updating framebuffer size %ux%u.\n", width, height);
if ((i != (d3d11->shader_preset->passes - 1)) || (width != d3d11->vp.width) ||
(height != d3d11->vp.height))

2
gfx/drivers/d3d12.c
View File

@ -1286,7 +1286,7 @@ static void d3d12_init_render_targets(d3d12_video_t* d3d12, unsigned width, unsi
height = d3d12->vp.height;
}
RARCH_LOG("[D3D12]: Updating framebuffer size %u x %u.\n", width, height);
RARCH_LOG("[D3D12]: Updating framebuffer size %ux%u.\n", width, height);
if ((i != (d3d12->shader_preset->passes - 1)) || (width != d3d12->vp.width) ||
(height != d3d12->vp.height))

4
gfx/drivers/d3d9.c
View File

@ -240,7 +240,7 @@ static bool d3d9_init_chain(d3d9_video_t *d3d,
return false;
}
RARCH_LOG("[D3D9]: Renderchain driver: %s\n", d3d->renderchain_driver->ident);
RARCH_LOG("[D3D9]: Renderchain driver: \"%s\".\n", d3d->renderchain_driver->ident);
d3d9_log_info(&link_info);
#ifndef _XBOX
@ -1240,7 +1240,7 @@ static bool d3d9_init_internal(d3d9_video_t *d3d,
snprintf(version_str, sizeof(version_str), "%u.%u.%u.%u", HIWORD(ident.DriverVersion.HighPart), LOWORD(ident.DriverVersion.HighPart), HIWORD(ident.DriverVersion.LowPart), LOWORD(ident.DriverVersion.LowPart));
RARCH_LOG("[D3D9]: Using GPU: %s\n", ident.Description);
RARCH_LOG("[D3D9]: Using GPU: \"%s\".\n", ident.Description);
RARCH_LOG("[D3D9]: GPU API Version: %s\n", version_str);
video_driver_set_gpu_device_string(ident.Description);

2
gfx/drivers/gdi_gfx.c
View File

@ -253,7 +253,7 @@ static void *gdi_gfx_init(const video_info_t *video,
mode_width = 0;
mode_height = 0;
RARCH_LOG("[GDI]: Detecting screen resolution %ux%u.\n", full_x, full_y);
RARCH_LOG("[GDI]: Detecting screen resolution: %ux%u.\n", full_x, full_y);
win_width = video->width;
win_height = video->height;

6
gfx/drivers/gl1.c
View File

@ -272,7 +272,7 @@ static void *gl1_gfx_init(const video_info_t *video,
video_context_driver_set((const gfx_ctx_driver_t*)ctx_driver);
RARCH_LOG("[GL1]: Found GL1 context: %s\n", ctx_driver->ident);
RARCH_LOG("[GL1]: Found GL1 context: \"%s\".\n", ctx_driver->ident);
if (gl1->ctx_driver->get_video_size)
gl1->ctx_driver->get_video_size(gl1->ctx_data,
@ -296,7 +296,7 @@ static void *gl1_gfx_init(const video_info_t *video,
if (string_is_equal(ctx_driver->ident, "null"))
goto error;
RARCH_LOG("[GL1]: Detecting screen resolution %ux%u.\n", full_x, full_y);
RARCH_LOG("[GL1]: Detecting screen resolution: %ux%u.\n", full_x, full_y);
win_width = video->width;
win_height = video->height;
@ -345,7 +345,7 @@ static void *gl1_gfx_init(const video_info_t *video,
video_driver_get_size(&temp_width, &temp_height);
RARCH_LOG("[GL1]: Using resolution %ux%u\n", temp_width, temp_height);
RARCH_LOG("[GL1]: Using resolution %ux%u.\n", temp_width, temp_height);
vendor = (const char*)glGetString(GL_VENDOR);
renderer = (const char*)glGetString(GL_RENDERER);

22
gfx/drivers/gl2.c
View File

@ -1132,7 +1132,7 @@ static void gl2_renderchain_init(
{
gl->fbo_rect[i].width = next_pow2(gl->fbo_rect[i].img_width);
gl->fbo_rect[i].height = next_pow2(gl->fbo_rect[i].img_height);
RARCH_LOG("[GL]: Creating FBO %d @ %ux%u\n", i,
RARCH_LOG("[GL]: Creating FBO %d @ %ux%u.\n", i,
gl->fbo_rect[i].width, gl->fbo_rect[i].height);
}
@ -1142,7 +1142,7 @@ static void gl2_renderchain_init(
if (gl->fbo_feedback_enable && gl->fbo_feedback_pass
< (unsigned)chain->fbo_pass)
{
RARCH_LOG("[GL]: Creating feedback FBO %d @ %ux%u\n", i,
RARCH_LOG("[GL]: Creating feedback FBO %d @ %ux%u.\n", i,
gl->fbo_rect[gl->fbo_feedback_pass].width,
gl->fbo_rect[gl->fbo_feedback_pass].height);
}
@ -1182,7 +1182,7 @@ static bool gl2_renderchain_init_hw_render(
* FBOs are "abstract" objects and are not shared. */
gl2_context_bind_hw_render(gl, true);
RARCH_LOG("[GL]: Initializing HW render (%u x %u).\n", width, height);
RARCH_LOG("[GL]: Initializing HW render (%ux%u).\n", width, height);
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_fbo_size);
glGetIntegerv(RARCH_GL_MAX_RENDERBUFFER_SIZE, &max_renderbuffer_size);
RARCH_LOG("[GL]: Max texture size: %d px, renderbuffer size: %d px.\n",
@ -1742,7 +1742,7 @@ static bool gl2_add_lut(
if (!image_texture_load(&img, lut_path))
{
RARCH_ERR("[GL]: Failed to load texture image from: \"%s\"\n",
RARCH_ERR("[GL]: Failed to load texture image from: \"%s\".\n",
lut_path);
return false;
}
@ -1981,7 +1981,7 @@ static const shader_backend_t *gl_shader_driver_set_backend(
{
enum rarch_shader_type fallback = gl2_get_fallback_shader_type(type);
if (fallback != type)
RARCH_ERR("[Shader driver]: Shader backend %d not supported, falling back to %d.", type, fallback);
RARCH_ERR("[Shader driver]: Shader backend %d not supported, falling back to %d.\n", type, fallback);
switch (fallback)
{
@ -2022,7 +2022,7 @@ static bool gl_shader_driver_init(video_shader_ctx_init_t *init)
if (string_is_equal(settings->arrays.menu_driver, "xmb")
&& init->shader->init_menu_shaders)
{
RARCH_LOG("Setting up menu pipeline shaders for XMB ... \n");
RARCH_LOG("Setting up menu pipeline shaders for XMB ...\n");
init->shader->init_menu_shaders(tmp);
}
@ -2527,7 +2527,7 @@ static void gl2_video_layout_fbo_init(gl2_t *gl, unsigned width, unsigned height
if (gl2_check_fb_status(RARCH_GL_FRAMEBUFFER) !=
RARCH_GL_FRAMEBUFFER_COMPLETE)
RARCH_LOG("[GL]: Unable to create FBO for video_layout\n");
RARCH_ERR("[GL]: Unable to create FBO for video_layout.\n");
gl2_bind_fb(0);
}
@ -2921,7 +2921,7 @@ static bool gl2_frame(void *data, const void *frame,
}
}
RARCH_LOG("[GL]: Recreating FBO texture #%d: %ux%u\n",
RARCH_LOG("[GL]: Recreating FBO texture #%d: %ux%u.\n",
i, fbo_rect->width, fbo_rect->height);
}
}
@ -3630,7 +3630,7 @@ static void *gl2_init(const video_info_t *video,
gl->ctx_driver = ctx_driver;
gl->video_info = *video;
RARCH_LOG("[GL]: Found GL context: %s\n", ctx_driver->ident);
RARCH_LOG("[GL]: Found GL context: \"%s\".\n", ctx_driver->ident);
if (gl->ctx_driver->get_video_size)
gl->ctx_driver->get_video_size(gl->ctx_data,
@ -3644,7 +3644,7 @@ static void *gl2_init(const video_info_t *video,
full_y = mode_height;
interval = 0;
RARCH_LOG("[GL]: Detecting screen resolution %ux%u.\n", full_x, full_y);
RARCH_LOG("[GL]: Detecting screen resolution: %ux%u.\n", full_x, full_y);
if (video->vsync)
interval = video->swap_interval;
@ -3815,7 +3815,7 @@ static void *gl2_init(const video_info_t *video,
gl->video_width = temp_width;
gl->video_height = temp_height;
RARCH_LOG("[GL]: Using resolution %ux%u\n", temp_width, temp_height);
RARCH_LOG("[GL]: Using resolution %ux%u.\n", temp_width, temp_height);
gl->vertex_ptr = hwr->bottom_left_origin
? vertexes : vertexes_flipped;

8
gfx/drivers/gl3.c
View File

@ -606,7 +606,7 @@ static bool gl3_init_hw_render(gl3_t *gl, unsigned width, unsigned height)
gl3_context_bind_hw_render(gl, true);
RARCH_LOG("[GLCore]: Initializing HW render (%u x %u).\n", width, height);
RARCH_LOG("[GLCore]: Initializing HW render (%ux%u).\n", width, height);
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_fbo_size);
glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &max_rb_size);
RARCH_LOG("[GLCore]: Max texture size: %d px, renderbuffer size: %d px.\n",
@ -1180,7 +1180,7 @@ static void *gl3_init(const video_info_t *video,
gl->ctx_driver = ctx_driver;
gl->video_info = *video;
RARCH_LOG("[GLCore]: Found GL context: %s\n", ctx_driver->ident);
RARCH_LOG("[GLCore]: Found GL context: \"%s\".\n", ctx_driver->ident);
if (gl->ctx_driver->get_video_size)
gl->ctx_driver->get_video_size(gl->ctx_data,
@ -1192,7 +1192,7 @@ static void *gl3_init(const video_info_t *video,
mode_height = 0;
interval = 0;
RARCH_LOG("[GLCore]: Detecting screen resolution %ux%u.\n", full_x, full_y);
RARCH_LOG("[GLCore]: Detecting screen resolution: %ux%u.\n", full_x, full_y);
if (video->vsync)
interval = video->swap_interval;
@ -1303,7 +1303,7 @@ static void *gl3_init(const video_info_t *video,
gl->video_width = temp_width;
gl->video_height = temp_height;
RARCH_LOG("[GLCore]: Using resolution %ux%u\n", temp_width, temp_height);
RARCH_LOG("[GLCore]: Using resolution %ux%u.\n", temp_width, temp_height);
/* Set the viewport to fix recording, since it needs to know
* the viewport sizes before we start running. */

2
gfx/drivers/vg.c
View File

@ -145,7 +145,7 @@ static void *vg_init(const video_info_t *video,
temp_width = mode_width;
temp_height = mode_height;
RARCH_LOG("[VG]: Detecting screen resolution %ux%u.\n", temp_width, temp_height);
RARCH_LOG("[VG]: Detecting screen resolution: %ux%u.\n", temp_width, temp_height);
if (temp_width != 0 && temp_height != 0)
video_driver_set_size(temp_width, temp_height);

6
gfx/drivers/vulkan.c
View File

@ -1204,7 +1204,7 @@ static void *vulkan_init(const video_info_t *video,
video_context_driver_set((const gfx_ctx_driver_t*)ctx_driver);
RARCH_LOG("[Vulkan]: Found vulkan context: %s\n", ctx_driver->ident);
RARCH_LOG("[Vulkan]: Found vulkan context: \"%s\".\n", ctx_driver->ident);
if (vk->ctx_driver->get_video_size)
vk->ctx_driver->get_video_size(vk->ctx_data,
@ -1215,7 +1215,7 @@ static void *vulkan_init(const video_info_t *video,
mode_width = 0;
mode_height = 0;
RARCH_LOG("[Vulkan]: Detecting screen resolution %ux%u.\n", full_x, full_y);
RARCH_LOG("[Vulkan]: Detecting screen resolution: %ux%u.\n", full_x, full_y);
interval = video->vsync ? video->swap_interval : 0;
if (ctx_driver->swap_interval)
@ -1257,7 +1257,7 @@ static void *vulkan_init(const video_info_t *video,
vk->video_width = temp_width;
vk->video_height = temp_height;
RARCH_LOG("[Vulkan]: Using resolution %ux%u\n", temp_width, temp_height);
RARCH_LOG("[Vulkan]: Using resolution %ux%u.\n", temp_width, temp_height);
if (!vk->ctx_driver || !vk->ctx_driver->get_context_data)
{

2
gfx/drivers_context/wgl_ctx.c
View File

@ -349,7 +349,7 @@ static void create_gl_context(HWND hwnd, bool *quit)
if (wglGetExtensionsStringARB)
{
extensions = wglGetExtensionsStringARB(win32_hdc);
RARCH_LOG("[WGL] extensions: %s\n", extensions);
RARCH_LOG("[WGL]: Extensions: %s\n", extensions);
if (wgl_has_extension("WGL_EXT_swap_control_tear", extensions))
{
RARCH_LOG("[WGL]: Adaptive VSync supported.\n");

6
gfx/drivers_shader/glslang_util_cxx.cpp
View File

@ -226,7 +226,7 @@ bool glslang_compile_shader(const char *shader_path, glslang_output *output)
if (!string_list_initialize(&lines))
return false;
RARCH_LOG("[slang]: Compiling shader \"%s\".\n", shader_path);
RARCH_LOG("[slang]: Compiling shader: \"%s\".\n", shader_path);
if (!glslang_read_shader_file(shader_path, &lines, true))
goto error;
@ -237,14 +237,14 @@ bool glslang_compile_shader(const char *shader_path, glslang_output *output)
if (!glslang::compile_spirv(build_stage_source(&lines, "vertex"),
glslang::StageVertex, &output->vertex))
{
RARCH_ERR("Failed to compile vertex shader stage.\n");
RARCH_ERR("[slang]: Failed to compile vertex shader stage.\n");
goto error;
}
if (!glslang::compile_spirv(build_stage_source(&lines, "fragment"),
glslang::StageFragment, &output->fragment))
{
RARCH_ERR("Failed to compile fragment shader stage.\n");
RARCH_ERR("[slang]: Failed to compile fragment shader stage.\n");
goto error;
}

4
gfx/drivers_shader/shader_vulkan.cpp
View File

@ -2377,7 +2377,7 @@ Framebuffer::Framebuffer(
memory_properties(mem_props),
device(device)
{
RARCH_LOG("[Vulkan filter chain]: Creating framebuffer %u x %u (max %u level(s)).\n",
RARCH_LOG("[Vulkan filter chain]: Creating framebuffer %ux%u (max %u level(s)).\n",
max_size.width, max_size.height, max_levels);
vulkan_initialize_render_pass(device, format, &render_pass);
init(nullptr);
@ -2478,7 +2478,7 @@ void Framebuffer::set_size(DeferredDisposer &disposer, const Size2D &size, VkFor
if (format != VK_FORMAT_UNDEFINED)
this->format = format;
RARCH_LOG("[Vulkan filter chain]: Updating framebuffer size %u x %u (format: %u).\n",
RARCH_LOG("[Vulkan filter chain]: Updating framebuffer size %ux%u (format: %u).\n",
size.width, size.height, (unsigned)this->format);
{

4
gfx/font_driver.c
View File

@ -67,13 +67,13 @@ int font_renderer_create_default(
*handle = font_backends[i]->init(path, font_size);
if (*handle)
{
RARCH_LOG("[Font]: Using font rendering backend: %s.\n",
RARCH_LOG("[Font]: Using font rendering backend: \"%s\".\n",
font_backends[i]->ident);
*drv = font_backends[i];
return 1;
}
RARCH_ERR("[Font]: Failed to create rendering backend: %s.\n",
RARCH_ERR("[Font]: Failed to create rendering backend: \"%s\".\n",
font_backends[i]->ident);
}

6
gfx/video_driver.c
View File

@ -1039,7 +1039,7 @@ void* video_display_server_init(enum rarch_display_type type)
if (!string_is_empty(current_display_server->ident))
{
RARCH_LOG("[Video]: Found display server: %s\n",
RARCH_LOG("[Video]: Found display server: \"%s\".\n",
current_display_server->ident);
}
}
@ -3394,9 +3394,9 @@ bool video_driver_init_internal(bool *video_is_threaded, bool verbosity_enabled)
}
if (width && height)
RARCH_LOG("[Video]: Video @ %ux%u\n", width, height);
RARCH_LOG("[Video]: Set video size to: %ux%u.\n", width, height);
else
RARCH_LOG("[Video]: Video @ fullscreen\n");
RARCH_LOG("[Video]: Set video size to: fullscreen.\n");
video_st->display_type = RARCH_DISPLAY_NONE;
video_st->display = 0;

4
gfx/video_shader_parse.c
View File

@ -2051,7 +2051,7 @@ static bool dir_init_shader_internal(
if (!string_is_empty(file_name) &&
string_is_equal(file_name, shader_file_name))
{
RARCH_LOG("[Shaders]: %s \"%s\"\n",
RARCH_LOG("[Shaders]: %s \"%s\".\n",
msg_hash_to_str(MSG_FOUND_SHADER),
file_path);
@ -2546,7 +2546,7 @@ const char *retroarch_get_shader_preset(void)
runloop_st->runtime_shader_preset_path,
sizeof(runloop_st->runtime_shader_preset_path)))
{
RARCH_LOG("[Shaders]: Specific shader preset found at %s.\n",
RARCH_LOG("[Shaders]: Specific shader preset found at \"%s\".\n",
runloop_st->runtime_shader_preset_path);
}
}

6
intl/msg_hash_us.h
View File

@ -12015,15 +12015,15 @@ MSG_HASH(
)
MSG_HASH(
MSG_RUNAHEAD_FAILED_TO_SAVE_STATE,
"Failed to save state. Run-Ahead has been disabled."
"Failed to save state. Run-Ahead has been disabled."
)
MSG_HASH(
MSG_RUNAHEAD_FAILED_TO_LOAD_STATE,
"Failed to load state. Run-Ahead has been disabled."
"Failed to load state. Run-Ahead has been disabled."
)
MSG_HASH(
MSG_RUNAHEAD_FAILED_TO_CREATE_SECONDARY_INSTANCE,
"Failed to create second instance. Run-Ahead will now use only one instance."
"Failed to create second instance. Run-Ahead will now use only one instance."
)
MSG_HASH(
MSG_SCANNING_OF_FILE_FINISHED,

4
led/led_driver.c
View File

@ -16,6 +16,7 @@
#include <string/stdstring.h>
#include "led_driver.h"
#include "verbosity.h"
static const led_driver_t *current_led_driver = NULL;
@ -56,6 +57,9 @@ void led_driver_init(const char *led_driver)
if (current_led_driver)
(*current_led_driver->init)();
if (!string_is_equal("null", drivername))
RARCH_LOG("[LED]: Using driver: \"%s\".\n", led_driver);
}
void led_driver_free(void)

18
record/record_driver.c
View File

@ -85,12 +85,12 @@ static void find_record_driver(const char *prefix,
{
unsigned d;
RARCH_ERR("[recording] Couldn't find any %s named \"%s\"\n", prefix,
RARCH_ERR("[Recording]: Couldn't find any %s named \"%s\".\n", prefix,
settings->arrays.record_driver);
RARCH_LOG_OUTPUT("Available %ss are:\n", prefix);
for (d = 0; record_drivers[d]; d++)
RARCH_LOG_OUTPUT("\t%s\n", record_drivers[d].ident);
RARCH_WARN("[recording] Going to default to first %s...\n", prefix);
RARCH_WARN("[Recording]: Going to default to first %s...\n", prefix);
}
recording_state.driver = (const record_driver_t*)record_drivers[0];
@ -215,19 +215,19 @@ bool recording_init(void)
if (current_core_type == CORE_TYPE_DUMMY)
{
RARCH_WARN("[recording] %s\n",
RARCH_WARN("[Recording]: %s\n",
msg_hash_to_str(MSG_USING_LIBRETRO_DUMMY_CORE_RECORDING_SKIPPED));
return false;
}
if (!video_gpu_record && video_driver_is_hw_context())
{
RARCH_WARN("[recording] %s.\n",
RARCH_WARN("[Recording]: %s.\n",
msg_hash_to_str(MSG_HW_RENDERED_MUST_USE_POSTSHADED_RECORDING));
return false;
}
RARCH_LOG("[recording] %s: FPS: %.4f, Sample rate: %.4f\n",
RARCH_LOG("[Recording]: %s: FPS: %.2f, Sample rate: %.2f\n",
msg_hash_to_str(MSG_CUSTOM_TIMING_GIVEN),
(float)av_info->timing.fps,
(float)av_info->timing.sample_rate);
@ -338,7 +338,7 @@ bool recording_init(void)
if (!vp.width || !vp.height)
{
RARCH_ERR("[recording] Failed to get viewport information from video driver. "
RARCH_ERR("[Recording]: Failed to get viewport information from video driver. "
"Cannot start recording ...\n");
return false;
}
@ -358,7 +358,7 @@ bool recording_init(void)
recording_st->gpu_width = vp.width;
recording_st->gpu_height = vp.height;
RARCH_LOG("[recording] %s %u x %u\n", msg_hash_to_str(MSG_DETECTED_VIEWPORT_OF),
RARCH_LOG("[Recording]: %s %ux%u.\n", msg_hash_to_str(MSG_DETECTED_VIEWPORT_OF),
vp.width, vp.height);
gpu_size = vp.width * vp.height * 3;
@ -400,7 +400,7 @@ bool recording_init(void)
#endif
}
RARCH_LOG("[recording] %s %s @ %ux%u. (FB size: %ux%u pix_fmt: %u)\n",
RARCH_LOG("[Recording]: %s %s @ %ux%u. (FB size: %ux%u pix_fmt: %u)\n",
msg_hash_to_str(MSG_RECORDING_TO),
output,
params.out_width, params.out_height,
@ -411,7 +411,7 @@ bool recording_init(void)
&recording_state.driver,
&recording_state.data, &params))
{
RARCH_ERR("[recording] %s\n",
RARCH_ERR("[Recording]: %s\n",
msg_hash_to_str(MSG_FAILED_TO_START_RECORDING));
video_driver_gpu_record_deinit();

10
retroarch.c
View File

@ -2229,7 +2229,7 @@ bool command_event(enum event_command cmd, void *data)
/* Note: Sorting is disabled by default for
* all content history playlists */
RARCH_LOG("[Playlist]: %s: [%s].\n",
RARCH_LOG("[Playlist]: %s: \"%s\".\n",
msg_hash_to_str(MSG_LOADING_HISTORY_FILE),
path_content_history);
playlist_config_set_path(&playlist_config, path_content_history);
@ -2237,7 +2237,7 @@ bool command_event(enum event_command cmd, void *data)
playlist_set_sort_mode(
g_defaults.content_history, PLAYLIST_SORT_MODE_OFF);
RARCH_LOG("[Playlist]: %s: [%s].\n",
RARCH_LOG("[Playlist]: %s: \"%s\".\n",
msg_hash_to_str(MSG_LOADING_HISTORY_FILE),
path_content_music_history);
playlist_config_set_path(&playlist_config, path_content_music_history);
@ -2246,7 +2246,7 @@ bool command_event(enum event_command cmd, void *data)
g_defaults.music_history, PLAYLIST_SORT_MODE_OFF);
#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
RARCH_LOG("[Playlist]: %s: [%s].\n",
RARCH_LOG("[Playlist]: %s: \"%s\".\n",
msg_hash_to_str(MSG_LOADING_HISTORY_FILE),
path_content_video_history);
playlist_config_set_path(&playlist_config, path_content_video_history);
@ -2256,7 +2256,7 @@ bool command_event(enum event_command cmd, void *data)
#endif
#ifdef HAVE_IMAGEVIEWER
RARCH_LOG("[Playlist]: %s: [%s].\n",
RARCH_LOG("[Playlist]: %s: \"%s\".\n",
msg_hash_to_str(MSG_LOADING_HISTORY_FILE),
path_content_image_history);
playlist_config_set_path(&playlist_config, path_content_image_history);
@ -5944,7 +5944,7 @@ void rarch_favorites_init(void)
rarch_favorites_deinit();
RARCH_LOG("[Playlist]: %s: [%s].\n",
RARCH_LOG("[Playlist]: %s: \"%s\".\n",
msg_hash_to_str(MSG_LOADING_FAVORITES_FILE),
path_content_favorites);
playlist_config_set_path(&playlist_config, path_content_favorites);

33
runloop.c
View File

@ -1037,7 +1037,7 @@ static void runloop_deinit_core_options(
core_option_manager_flush(
core_options,
conf_tmp);
RARCH_LOG("[Core Options]: Saved %s-specific core options to \"%s\"\n",
RARCH_LOG("[Core]: Saved %s-specific core options to \"%s\".\n",
game_options_active ? "game" : "folder", path_core_options);
config_file_write(conf_tmp, path_core_options, true);
config_file_free(conf_tmp);
@ -1051,7 +1051,7 @@ static void runloop_deinit_core_options(
core_option_manager_flush(
core_options,
core_options->conf);
RARCH_LOG("[Core Options]: Saved core options file to \"%s\"\n", path);
RARCH_LOG("[Core]: Saved core options file to \"%s\".\n", path);
config_file_write(core_options->conf, path, true);
}
@ -2621,7 +2621,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
~(DRIVER_VIDEO_MASK | DRIVER_INPUT_MASK |
DRIVER_MENU_MASK);
RARCH_LOG("[Environ]: SET_SYSTEM_AV_INFO: %ux%u, aspect: %.3f, fps: %.3f, sample rate: %.2f Hz.\n",
RARCH_LOG("[Environ]: SET_SYSTEM_AV_INFO: %ux%u, Aspect: %.3f, FPS: %.2f, Sample rate: %.2f Hz.\n",
(*info)->geometry.base_width, (*info)->geometry.base_height,
(*info)->geometry.aspect_ratio,
(*info)->timing.fps,
@ -2853,7 +2853,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
geom->base_height = in_geom->base_height;
geom->aspect_ratio = in_geom->aspect_ratio;
RARCH_LOG("[Environ]: SET_GEOMETRY: %ux%u, aspect: %.3f.\n",
RARCH_LOG("[Environ]: SET_GEOMETRY: %ux%u, Aspect: %.3f.\n",
geom->base_width, geom->base_height, geom->aspect_ratio);
/* Forces recomputation of aspect ratios if
@ -2971,17 +2971,18 @@ bool runloop_environment_cb(unsigned cmd, void *data)
struct retro_vfs_interface_info *vfs_iface_info = (struct retro_vfs_interface_info *) data;
if (vfs_iface_info->required_interface_version <= supported_vfs_version)
{
RARCH_LOG("Core requested VFS version >= v%d, providing v%d\n", vfs_iface_info->required_interface_version, supported_vfs_version);
RARCH_LOG("[Environ]: GET_VFS_INTERFACE. Core requested version >= V%d, providing V%d.\n",
vfs_iface_info->required_interface_version, supported_vfs_version);
vfs_iface_info->required_interface_version = supported_vfs_version;
vfs_iface_info->iface = &vfs_iface;
system->supports_vfs = true;
}
else
{
RARCH_WARN("Core requested VFS version v%d which is higher than what we support (v%d)\n", vfs_iface_info->required_interface_version, supported_vfs_version);
RARCH_WARN("[Environ]: GET_VFS_INTERFACE. Core requested version V%d which is higher than what we support (V%d).\n",
vfs_iface_info->required_interface_version, supported_vfs_version);
return false;
}
break;
}
@ -2991,6 +2992,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
(struct retro_led_interface *)data;
if (ledintf)
ledintf->set_led_state = led_driver_set_led;
RARCH_LOG("[Environ]: GET_LED_INTERFACE.\n");
}
break;
@ -3247,7 +3249,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
*game_info_ext = p_content->content_list->game_info_ext;
else
{
RARCH_ERR("[Environ]: Failed to retrieve extended game info\n");
RARCH_ERR("[Environ]: Failed to retrieve extended game info.\n");
*game_info_ext = NULL;
return false;
}
@ -4718,6 +4720,7 @@ static void do_runahead(
{
if (!runahead_hide_warnings)
runloop_msg_queue_push(msg_hash_to_str(MSG_RUNAHEAD_CORE_DOES_NOT_SUPPORT_SAVESTATES), 0, 2 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_WARN("[Run-Ahead]: %s\n", msg_hash_to_str(MSG_RUNAHEAD_CORE_DOES_NOT_SUPPORT_SAVESTATES));
goto force_input_dirty;
}
}
@ -4762,6 +4765,7 @@ static void do_runahead(
if (!runahead_save_state(runloop_st))
{
runloop_msg_queue_push(msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_SAVE_STATE), 0, 3 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_WARN("[Run-Ahead]: %s\n", msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_SAVE_STATE));
return;
}
}
@ -4771,6 +4775,7 @@ static void do_runahead(
if (!runahead_load_state(runloop_st))
{
runloop_msg_queue_push(msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_LOAD_STATE), 0, 3 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_WARN("[Run-Ahead]: %s\n", msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_LOAD_STATE));
return;
}
}
@ -4784,6 +4789,7 @@ static void do_runahead(
runloop_secondary_core_destroy();
runloop_st->runahead_secondary_core_available = false;
runloop_msg_queue_push(msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_CREATE_SECONDARY_INSTANCE), 0, 3 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_WARN("[Run-Ahead]: %s\n", msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_CREATE_SECONDARY_INSTANCE));
goto force_input_dirty;
}
@ -4800,12 +4806,14 @@ static void do_runahead(
if (!runahead_save_state(runloop_st))
{
runloop_msg_queue_push(msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_SAVE_STATE), 0, 3 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_WARN("[Run-Ahead]: %s\n", msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_SAVE_STATE));
return;
}
if (!runahead_load_state_secondary())
{
runloop_msg_queue_push(msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_LOAD_STATE), 0, 3 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_WARN("[Run-Ahead]: %s\n", msg_hash_to_str(MSG_RUNAHEAD_FAILED_TO_LOAD_STATE));
return;
}
@ -5183,17 +5191,16 @@ static bool core_verify_api_version(void)
runloop_state_t *runloop_st = &runloop_state;
unsigned api_version = runloop_st->current_core.retro_api_version();
RARCH_LOG("%s: %u\n%s %s: %u\n",
RARCH_LOG("[Core]: %s: %u, %s: %u\n",
msg_hash_to_str(MSG_VERSION_OF_LIBRETRO_API),
api_version,
FILE_PATH_LOG_INFO,
msg_hash_to_str(MSG_COMPILED_AGAINST_API),
RETRO_API_VERSION
);
if (api_version != RETRO_API_VERSION)
{
RARCH_WARN("%s\n", msg_hash_to_str(MSG_LIBRETRO_ABI_BREAK));
RARCH_WARN("[Core]: %s\n", msg_hash_to_str(MSG_LIBRETRO_ABI_BREAK));
return false;
}
return true;
@ -6026,8 +6033,8 @@ void core_options_flush(void)
/* Log result */
RARCH_LOG(success ?
"[Core Options]: Saved core options to \"%s\"\n" :
"[Core Options]: Failed to save core options to \"%s\"\n",
"[Core]: Saved core options to \"%s\".\n" :
"[Core]: Failed to save core options to \"%s\".\n",
path_core_options ? path_core_options : "UNKNOWN");
snprintf(msg, sizeof(msg), "%s \"%s\"",

6
runtime_file.c
View File

@ -1146,7 +1146,7 @@ void runtime_log_save(runtime_log_t *runtime_log)
if (!runtime_log)
return;
RARCH_LOG("Saving runtime log file: %s\n", runtime_log->path);
RARCH_LOG("[Runtime]: Saving runtime log file: \"%s\".\n", runtime_log->path);
/* Attempt to open log file */
file = filestream_open(runtime_log->path,
@ -1154,7 +1154,7 @@ void runtime_log_save(runtime_log_t *runtime_log)
if (!file)
{
RARCH_ERR("Failed to open runtime log file: %s\n", runtime_log->path);
RARCH_ERR("[Runtime]: Failed to open runtime log file: \"%s\".\n", runtime_log->path);
return;
}
@ -1162,7 +1162,7 @@ void runtime_log_save(runtime_log_t *runtime_log)
writer = rjsonwriter_open_rfile(file);
if (!writer)
{
RARCH_ERR("Failed to create JSON writer.\n");
RARCH_ERR("[Runtime]: Failed to create JSON writer.\n");
goto end;
}

54
tasks/task_content.c
View File

@ -265,7 +265,7 @@ bool content_file_override_set(
RBUF_RESIZE(p_content->content_override_list,
num_entries + 1);
RARCH_LOG("[CONTENT OVERRIDE]: File Extension: '%s' - need_fullpath: %s, persistent_data: %s\n",
RARCH_LOG("[Content Override]: File Extension: '%s' - need_fullpath: %s, persistent_data: %s\n",
ext, overrides[i].need_fullpath ? "TRUE" : "FALSE",
overrides[i].persistent_data ? "TRUE" : "FALSE");
@ -398,12 +398,12 @@ static void content_file_list_free(
if (string_is_empty(path))
continue;
RARCH_LOG("[CONTENT LOAD]: %s: %s\n",
RARCH_LOG("[Content]: %s: \"%s\".\n",
msg_hash_to_str(MSG_REMOVING_TEMPORARY_CONTENT_FILE),
path);
if (filestream_delete(path) != 0)
RARCH_ERR("[CONTENT LOAD]: %s: %s.\n",
RARCH_ERR("[Content]: %s: \"%s\".\n",
msg_hash_to_str(MSG_FAILED_TO_REMOVE_TEMPORARY_FILE),
path);
}
@ -717,7 +717,7 @@ static bool content_file_load_into_memory(
*data = NULL;
*data_size = 0;
RARCH_LOG("[CONTENT LOAD]: %s: %s\n",
RARCH_LOG("[Content]: %s: \"%s\".\n",
msg_hash_to_str(MSG_LOADING_CONTENT_FILE), content_path);
/* Read content from file into memory buffer */
@ -771,7 +771,7 @@ static bool content_file_load_into_memory(
{
p_content->rom_crc = encoding_crc32(0, content_data,
(size_t)content_size);
RARCH_LOG("[CONTENT LOAD]: CRC32: 0x%x\n",
RARCH_LOG("[Content]: CRC32: 0x%x.\n",
(unsigned)p_content->rom_crc);
}
else
@ -806,7 +806,7 @@ static bool content_file_extract_from_archive(
temp_path[0] = '\0';
msg[0] = '\0';
RARCH_LOG("[CONTENT LOAD]: Core requires uncompressed content - "
RARCH_LOG("[Content]: Core requires uncompressed content - "
"extracting archive to temporary directory.\n");
/* Attempt to extract file */
@ -816,7 +816,7 @@ static bool content_file_extract_from_archive(
NULL : content_ctx->directory_cache,
temp_path, sizeof(temp_path)))
{
snprintf(msg, sizeof(msg), "%s: %s\n",
snprintf(msg, sizeof(msg), "%s: \"%s\".\n",
msg_hash_to_str(MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE),
*content_path);
*error_string = strdup(msg);
@ -834,7 +834,7 @@ static bool content_file_extract_from_archive(
/* Update content path pointer */
*content_path = temp_path_ptr;
RARCH_LOG("[CONTENT LOAD]: Content successfully extracted to: %s\n",
RARCH_LOG("[Content]: Content successfully extracted to: \"%s\".\n",
temp_path);
return true;
@ -1055,8 +1055,8 @@ static bool content_file_load(
new_path[0] = '\0';
new_basedir[0] = '\0';
RARCH_LOG("[CONTENT LOAD]: Core does not support VFS"
" - copying to cache directory\n");
RARCH_LOG("[Content]: Core does not support VFS"
" - copying to cache directory.\n");
if (!string_is_empty(content_ctx->directory_cache))
strlcpy(new_basedir, content_ctx->directory_cache,
@ -1066,7 +1066,7 @@ static bool content_file_load(
!path_is_directory(new_basedir) ||
!is_path_accessible_using_standard_io(new_basedir))
{
RARCH_WARN("[CONTENT LOAD]: Tried copying to cache directory, "
RARCH_WARN("[Content]: Tried copying to cache directory, "
"but cache directory was not set or found. "
"Setting cache directory to root of writable app directory...\n");
strlcpy(new_basedir, uwp_dir_data, sizeof(new_basedir));
@ -1104,7 +1104,7 @@ static bool content_file_load(
used_vfs_fallback_copy = true;
}
#endif
RARCH_LOG("[CONTENT LOAD]: %s\n", msg_hash_to_str(
RARCH_LOG("[Content]: %s\n", msg_hash_to_str(
MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT));
/* First content file is significant: need to
@ -1131,7 +1131,7 @@ static bool content_file_load(
content_path, content_data, content_size,
CONTENT_FILE_ATTR_GET_PERSISTENT(content->elems[i].attr), i))
{
RARCH_LOG("[CONTENT LOAD]: Failed to process content file: %s\n", content_path);
RARCH_LOG("[Content]: Failed to process content file: \"%s\".\n", content_path);
if (content_data)
free((void*)content_data);
*error_enum = MSG_FAILED_TO_LOAD_CONTENT;
@ -1364,13 +1364,13 @@ static void content_load_init_wrap(
if (args->content_path)
{
RARCH_LOG("[CORE]: Using content: %s.\n", args->content_path);
RARCH_LOG("[Core]: Using content: \"%s\".\n", args->content_path);
argv[(*argc)++] = strdup(args->content_path);
}
#ifdef HAVE_MENU
else
{
RARCH_LOG("[CORE]: %s\n",
RARCH_LOG("[Core]: %s\n",
msg_hash_to_str(MSG_NO_CONTENT_STARTING_DUMMY_CORE));
argv[(*argc)++] = strdup("--menu");
}
@ -1409,7 +1409,7 @@ static void content_load_init_wrap(
{
int i;
for (i = 0; i < *argc; i++)
RARCH_LOG("[CORE]: Arg #%d: %s\n", i, argv[i]);
RARCH_LOG("[Core]: Arg #%d: %s\n", i, argv[i]);
}
}
@ -1766,7 +1766,7 @@ static bool firmware_update_status(
firmware_info.directory.system = s;
}
RARCH_LOG("[CONTENT LOAD]: Updating firmware status for: %s on %s\n",
RARCH_LOG("[Content]: Updating firmware status for: %s on %s\n",
core_info->path,
firmware_info.directory.system);
@ -1786,7 +1786,7 @@ static bool firmware_update_status(
msg_hash_to_str(MSG_FIRMWARE),
100, 500, true, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_LOG("[CONTENT LOAD]: Load content blocked. Reason: %s\n",
RARCH_LOG("[Content]: Load content blocked. Reason: %s\n",
msg_hash_to_str(MSG_FIRMWARE));
return true;
@ -1864,7 +1864,7 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info)
if (error_string)
{
runloop_msg_queue_push(error_string, 2, 90, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_ERR("[CONTENT LOAD]: %s\n", error_string);
RARCH_ERR("[Content]: %s\n", error_string);
free(error_string);
}
}
@ -2007,7 +2007,7 @@ end:
if (error_string)
{
runloop_msg_queue_push(error_string, 2, 90, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_ERR("[CONTENT LOAD]: %s\n", error_string);
RARCH_ERR("[Content]: %s\n", error_string);
free(error_string);
}
@ -2093,7 +2093,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
if (error_string)
{
runloop_msg_queue_push(error_string, 2, 90, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_ERR("[CONTENT LOAD]: %s\n", error_string);
RARCH_ERR("[Content]: %s\n", error_string);
free(error_string);
}
@ -2234,7 +2234,7 @@ bool task_push_load_content_with_new_core_from_menu(
if (error_string)
{
runloop_msg_queue_push(error_string, 2, 90, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_ERR("[CONTENT LOAD]: %s\n", error_string);
RARCH_ERR("[Content]: %s\n", error_string);
free(error_string);
}
@ -2379,7 +2379,7 @@ end:
if (error_string)
{
runloop_msg_queue_push(error_string, 2, 90, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_ERR("[CONTENT LOAD]: %s\n", error_string);
RARCH_ERR("[Content]: %s\n", error_string);
free(error_string);
}
@ -2726,7 +2726,7 @@ uint32_t content_get_crc(void)
p_content->pending_rom_crc = false;
p_content->rom_crc = file_crc32(0,
(const char*)p_content->pending_rom_crc_path);
RARCH_LOG("[CONTENT LOAD]: CRC32: 0x%x .\n",
RARCH_LOG("[Content]: CRC32: 0x%x.\n",
(unsigned)p_content->rom_crc);
}
return p_content->rom_crc;
@ -2873,7 +2873,7 @@ bool content_init(void)
case MSG_ERROR_LIBRETRO_CORE_REQUIRES_VFS:
case MSG_FAILED_TO_LOAD_CONTENT:
case MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT:
RARCH_ERR("[CONTENT LOAD]: %s\n", msg_hash_to_str(error_enum));
RARCH_ERR("[Content]: %s\n", msg_hash_to_str(error_enum));
runloop_msg_queue_push(msg_hash_to_str(error_enum), 2, ret ? 1 : 180, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
break;
case MSG_UNKNOWN:
@ -2886,11 +2886,11 @@ bool content_init(void)
{
if (ret)
{
RARCH_LOG("[CONTENT LOAD]: %s\n", error_string);
RARCH_LOG("[Content]: %s\n", error_string);
}
else
{
RARCH_ERR("[CONTENT LOAD]: %s\n", error_string);
RARCH_ERR("[Content]: %s\n", error_string);
}
/* Do not flush the message queue here
* > This allows any core-generated error messages

2
tasks/task_patch.c
View File

@ -837,7 +837,7 @@ bool patch_content(
}
if(!patch_found)
RARCH_LOG("%s\n",
RARCH_LOG("[Content]: %s\n",
msg_hash_to_str(MSG_DID_NOT_FIND_A_VALID_CONTENT_PATCH));
return patch_found;