If it's in the right folder you can already use them by name only.

Dominus wrote on 2020-04-15, 11:35:

If it's in the right folder you can already use them by name only.

You're missing the point maybe, i can't place glsl files on a user dir during a package install because it's not allowed, and if it was it would be broken as soon as the user deleted the dosbox conf home. Package files need to go into read only package dirs, to be updated when the package updates (which it does automatically with launchpad ppas). So in order to use the 'small name' i need to have a extra fallback to that system dir.

ok, that wasn't very clear how and why. But anyway, this doesn't seem the right thread for this problem.

Serious Callers Only wrote on 2020-04-15, 11:30:

Can sh->getValue here really be different from sh->realpath ? If so what's the difference, getValue is the filename and realpath the whole path?

Paths in the config file may be relative to the location of that file, realpath handles that translation.

Still confused jmarsh :

else if (!RENDER_GetShader(sh->realpath)) //tries to turn path relative to current conf file and check if it exists,
....
if ( !RENDER_GetShader(path) //if that fails tries to read from config path+raw 'glsl path' string
&& (sh->realpath==f || !RENDER_GetShader(f))) //if that fails, and if the raw path is different from the 'relative to conf' path, try to read from the raw path

Shouldn't the order be
1. check path relative to current conf file
2. check raw path
3. only fallback to confhome+raw after both of these fail?

Like this:

1 else if (!RENDER_GetShader(sh->realpath) && (sh->realpath==f || !RENDER_GetShader(f)) ) {
2		std::string path;
3		Cross::GetPlatformConfigDir(path);
4		path = path + "glshaders" + CROSS_FILESPLIT + f;
5		if ( !RENDER_GetShader(path)) {
6			sh->SetValue("none");
7			LOG_MSG("Shader file \"%s\" not found", f.c_str());
8		}
9}

which i'd turn into

1 else if (!RENDER_GetShader(sh->realpath) && (sh->realpath==f || !RENDER_GetShader(f)) ) {
2		std::string path; 
3		std::string path2;
4		Cross::GetPlatformConfigDir(path);
5		path = path + "glshaders" + CROSS_FILESPLIT + f;
6		path2= "/usr/share/dosbox/glsl/"+f;
7		if ( !RENDER_GetShader(path) && !RENDER_GetShader(path2)) {
8				sh->SetValue("none");
9				LOG_MSG("Shader file \"%s\" not found", f.c_str());
10		}
11}

edit: mmh, maybe i should just remove the sh->realpath==f check and reorder. It looks like a optimization.

Serious Callers Only wrote on 2020-04-15, 12:47:

Shouldn't the order be

No. The ability to override the built-in shaders was intentional in case it was discovered they didn't work with certain hardware.

that makes sense.

1	} else if (!RENDER_GetShader(sh->realpath)) {
2		std::string path;
3		std::string path2;
4		Cross::GetPlatformConfigDir(path);
5		path = path + "glshaders" + CROSS_FILESPLIT + f;
6        path2 = "/usr/share/dosbox/glshaders/"+f;
7		if ( !RENDER_GetShader(path)  && !RENDER_GetShader(path2) && !RENDER_GetShader(f) ) {
8			sh->SetValue("none");
9			LOG_MSG("Shader file \"%s\" not found", f.c_str());
10		}
11	}

read relative to conf, read from dosbox dir to override, read from the 'fixed' shader path, read raw file. The sh->realpath==f looks like a optimization and it makes my feeble brain not understand the condition, so if it goes away i'm almost sure it's correct. Files in path2 won't be the same as the builtin shaders, and files in the dosbox main dir will override always if not relative to the conf file, so it's ok. I think.

split this from some more shaders for SVN r4319 and later

if you need a more appropriate subject, let me know 😀

This is already done and running, no need for more posts.