Shadersystem / Texturescache

[greebo]

The ShaderLibrary is the one that holds all the named ShaderDefinitions and named Shader objects. It gets populated by the ShaderFileParser during startup or when the user requests a shader refresh.

 

I first assumed that the Library is the only class holding a strong ShaderPtr, but I didn't think of the OpenGLShader (I haven't touched that one, you know that one probably better).

[OrbWeaver]

Ah yes, now I remember. The OpenGLShaders I think are retained by the OpenGLShaderCache and handle all of the rendering stuff.

 

I think you might need to refresh both caches in this case, since there is no obvious candidate for a weak_ptr.

[greebo]

Ok, will look into that if it's possible, because the ShaderLibrary is contained within the shaders plugin and the OpenGLShader is part of the DarkRadiant core.

[OrbWeaver]

They are both modules though, there is a GlobalShaderCache() interface.

[greebo]

Yeah, just noticed that. I'm just trying if this works out:

 

GlobalShaderCache().unrealise();
GlobalShaderSystem().refresh();
GlobalShaderCache().realise();

 

Hopefully this lets the reference count actually reach 0, so that the textures get reloaded.

[greebo]

Got it. Additionally to the above lines, I also had to clear the IShaderPtr in the OpenGLShader::destroy() method in order to decrease the reference count. Now the textures are actually reloaded.

[OrbWeaver]

Got it. Additionally to the above lines, I also had to clear the IShaderPtr in the OpenGLShader::destroy() method in order to decrease the reference count. Now the textures are actually reloaded.

 

That's a bit daft, destroying the OpenGLShader should automatically release the IShaderPtr, that's the whole point. I'll have to look at this and see if there is any refactoring that can be done (explicit destroy methods are usually an indicator of bad design).