libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

More consistent log messages

Browse Source
This commit is contained in:
twinaphex 2017-03-24 00:30:14 +01:00
parent 1b27c3dec1
commit 755ceda4f9
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/drivers_shader/shader_gl_cg.c
View File

@ -442,7 +442,7 @@ static void gl_cg_deinit_progs(void *data)
if (!cg) if (!cg)
return; return;
RARCH_LOG("CG: Destroying programs.\n"); RARCH_LOG("[CG]: Destroying programs.\n");
cgGLUnbindProgram(cg->cgFProf); cgGLUnbindProgram(cg->cgFProf);
cgGLUnbindProgram(cg->cgVProf); cgGLUnbindProgram(cg->cgVProf);
@ -495,7 +495,7 @@ static void gl_cg_deinit_context_state(void *data)
cg_shader_data_t *cg = (cg_shader_data_t*)data; cg_shader_data_t *cg = (cg_shader_data_t*)data;
if (cg->cgCtx) if (cg->cgCtx)
{ {
RARCH_LOG("CG: Destroying context.\n"); RARCH_LOG("[CG]: Destroying context.\n");
cgDestroyContext(cg->cgCtx); cgDestroyContext(cg->cgCtx);
} }
cg->cgCtx = NULL; cg->cgCtx = NULL;
@ -609,7 +609,7 @@ static void gl_cg_set_program_base_attrib(void *data, unsigned i)
if (!semantic) if (!semantic)
continue; continue;
RARCH_LOG("CG: Found semantic \"%s\" in prog #%u.\n", semantic, i); RARCH_LOG("[CG]: Found semantic \"%s\" in prog #%u.\n", semantic, i);
semantic_hash = djb2_calculate(semantic); semantic_hash = djb2_calculate(semantic);
@ -678,7 +678,7 @@ static bool gl_cg_load_plain(void *data, const char *path)
if (string_is_empty(path)) if (string_is_empty(path))
{ {
RARCH_LOG("Loading stock Cg file.\n"); RARCH_LOG("[CG]: Loading stock Cg file.\n");
cg->prg[1] = cg->prg[0]; cg->prg[1] = cg->prg[0];
} }
else else
@ -688,7 +688,7 @@ static bool gl_cg_load_plain(void *data, const char *path)
program_info.combined = path; program_info.combined = path;
program_info.is_file = true; program_info.is_file = true;
RARCH_LOG("Loading Cg file: %s\n", path); RARCH_LOG("[CG]: Loading Cg file: %s\n", path);
strlcpy(cg->shader->pass[0].source.path, path, strlcpy(cg->shader->pass[0].source.path, path,
sizeof(cg->shader->pass[0].source.path)); sizeof(cg->shader->pass[0].source.path));
if (!gl_cg_compile_program(data, 1, &cg->prg[1], &program_info)) if (!gl_cg_compile_program(data, 1, &cg->prg[1], &program_info))
@ -773,7 +773,7 @@ static bool gl_cg_load_shader(void *data, unsigned i)
program_info.combined = cg->shader->pass[i].source.path; program_info.combined = cg->shader->pass[i].source.path;
program_info.is_file = true; program_info.is_file = true;
RARCH_LOG("Loading Cg shader: \"%s\".\n", RARCH_LOG("[CG]: Loading Cg shader: \"%s\".\n",
cg->shader->pass[i].source.path); cg->shader->pass[i].source.path);
if (!gl_cg_compile_program(data, i + 1, &cg->prg[i + 1],&program_info)) if (!gl_cg_compile_program(data, i + 1, &cg->prg[i + 1],&program_info))
@ -791,7 +791,7 @@ static bool gl_cg_load_preset(void *data, const char *path)
if (!gl_cg_load_stock(cg)) if (!gl_cg_load_stock(cg))
return false; return false;
RARCH_LOG("Loading Cg meta-shader: %s\n", path); RARCH_LOG("[CG]: Loading Cg meta-shader: %s\n", path);
conf = config_file_new(path); conf = config_file_new(path);
if (!conf) if (!conf)
{ {
@ -1044,8 +1044,8 @@ static void *gl_cg_init(void *data, const char *path)
goto error; goto error;
} }
RARCH_LOG("[Cg]: Vertex profile: %s\n", cgGetProfileString(cg->cgVProf)); RARCH_LOG("[CG]: Vertex profile: %s\n", cgGetProfileString(cg->cgVProf));
RARCH_LOG("[Cg]: Fragment profile: %s\n", cgGetProfileString(cg->cgFProf)); RARCH_LOG("[CG]: Fragment profile: %s\n", cgGetProfileString(cg->cgFProf));
cgGLSetOptimalOptions(cg->cgFProf); cgGLSetOptimalOptions(cg->cgFProf);
cgGLSetOptimalOptions(cg->cgVProf); cgGLSetOptimalOptions(cg->cgVProf);
cgGLEnableProfile(cg->cgFProf); cgGLEnableProfile(cg->cgFProf);

10
gfx/drivers_shader/shader_glsl.c
View File

@ -282,7 +282,7 @@ static bool gl_glsl_compile_shader(glsl_shader_data_t *glsl,
} }
snprintf(version, sizeof(version), "#version %u\n", version_no); snprintf(version, sizeof(version), "#version %u\n", version_no);
RARCH_LOG("[GL]: Using GLSL version %u.\n", version_no); RARCH_LOG("[GLSL]: Using GLSL version %u.\n", version_no);
} }
source[0] = version; source[0] = version;
@ -334,7 +334,7 @@ static bool gl_glsl_compile_program(
if (program_info->vertex) if (program_info->vertex)
{ {
RARCH_LOG("Found GLSL vertex shader.\n"); RARCH_LOG("[GLSL]: Found GLSL vertex shader.\n");
program->vprg = glCreateShader(GL_VERTEX_SHADER); program->vprg = glCreateShader(GL_VERTEX_SHADER);
if (!gl_glsl_compile_shader( if (!gl_glsl_compile_shader(
@ -351,7 +351,7 @@ static bool gl_glsl_compile_program(
if (program_info->fragment) if (program_info->fragment)
{ {
RARCH_LOG("Found GLSL fragment shader.\n"); RARCH_LOG("[GLSL]: Found GLSL fragment shader.\n");
program->fprg = glCreateShader(GL_FRAGMENT_SHADER); program->fprg = glCreateShader(GL_FRAGMENT_SHADER);
if (!gl_glsl_compile_shader(glsl, program->fprg, if (!gl_glsl_compile_shader(glsl, program->fprg,
"#define FRAGMENT\n#define PARAMETER_UNIFORM\n", program_info->fragment)) "#define FRAGMENT\n#define PARAMETER_UNIFORM\n", program_info->fragment))
@ -365,7 +365,7 @@ static bool gl_glsl_compile_program(
if (program_info->vertex || program_info->fragment) if (program_info->vertex || program_info->fragment)
{ {
RARCH_LOG("Linking GLSL program.\n"); RARCH_LOG("[GLSL]: Linking GLSL program.\n");
if (!gl_glsl_link_program(prog)) if (!gl_glsl_link_program(prog))
goto error; goto error;
@ -728,7 +728,7 @@ static void *gl_glsl_init(void *data, const char *path)
(void)shader_support; (void)shader_support;
#ifndef HAVE_OPENGLES #ifndef HAVE_OPENGLES
RARCH_LOG("Checking GLSL shader support ...\n"); RARCH_LOG("[GLSL]: Checking GLSL shader support ...\n");
shader_support = glCreateProgram && glUseProgram && glCreateShader shader_support = glCreateProgram && glUseProgram && glCreateShader
&& glDeleteShader && glShaderSource && glCompileShader && glAttachShader && glDeleteShader && glShaderSource && glCompileShader && glAttachShader
&& glDetachShader && glLinkProgram && glGetUniformLocation && glDetachShader && glLinkProgram && glGetUniformLocation