Revert "make shaders unzip on shader_dir instead of a subdirectory for consistency"

This reverts commit c78cf7dde65d3be4f3d52c4bf450c0ff3236e5d9.
This commit is contained in:
radius 2015-07-03 09:42:32 -05:00
parent 5abadccb3d
commit a47ff23546

View File

@ -150,11 +150,11 @@ static int cb_update_shaders_cg(void *data, size_t len)
{ {
char shaderdir[PATH_MAX_LENGTH]; char shaderdir[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
/* fill_pathname_join(shaderdir, settings->video.shader_dir, "shaders_cg", fill_pathname_join(shaderdir, settings->video.shader_dir, "shaders_cg",
sizeof(shaderdir)); sizeof(shaderdir));
if (!path_file_exists(shaderdir)) if (!path_file_exists(shaderdir))
if (!path_mkdir(shaderdir)) if (!path_mkdir(shaderdir))
return -1;*/ return -1;
return cb_generic_download(data, len, shaderdir); return cb_generic_download(data, len, shaderdir);
} }
@ -163,11 +163,11 @@ static int cb_update_shaders_glsl(void *data, size_t len)
{ {
char shaderdir[PATH_MAX_LENGTH]; char shaderdir[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
/* fill_pathname_join(shaderdir, settings->video.shader_dir, "shaders_glsl", fill_pathname_join(shaderdir, settings->video.shader_dir, "shaders_glsl",
sizeof(shaderdir)); sizeof(shaderdir));
if (!path_file_exists(shaderdir)) if (!path_file_exists(shaderdir))
if (!path_mkdir(shaderdir)) if (!path_mkdir(shaderdir))
return -1;*/ return -1;
return cb_generic_download(data, len, shaderdir); return cb_generic_download(data, len, shaderdir);
} }