Don't rebuild the dummy shader (less SourceShaderCache warning spam)

kahrl · kahrl · commit 922a30ee47ed · 2013-07-05T04:24:05.000+02:00
Also write something about rebuilding shaders to infostream in
Client::afterContentReceived()
diff --git a/src/client.cpp b/src/client.cpp
@@ -2850,6 +2850,7 @@ void Client::afterContentReceived(IrrlichtDevice *device, gui::IGUIFont* font)
 	m_tsrc->rebuildImagesAndTextures();
 
 	// Rebuild shaders
+	infostream<<"- Rebuilding shaders"<<std::endl;
 	m_shsrc->rebuildShaders();
 
 	// Update node aliases
diff --git a/src/shader.cpp b/src/shader.cpp
@@ -585,8 +585,10 @@ void ShaderSource::rebuildShaders()
 	// Recreate shaders
 	for(u32 i=0; i<m_shaderinfo_cache.size(); i++){
 		ShaderInfo *info = &m_shaderinfo_cache[i];
-		*info = generate_shader(info->name, m_device,
-				m_shader_callback, &m_sourcecache);
+		if(info->name != ""){
+			*info = generate_shader(info->name, m_device,
+					m_shader_callback, &m_sourcecache);
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -585,8 +585,10 @@ void ShaderSource::rebuildShaders()`
`585`	`585`	`// Recreate shaders`
`586`	`586`	`for(u32 i=0; i<m_shaderinfo_cache.size(); i++){`
`587`	`587`	`ShaderInfo *info = &m_shaderinfo_cache[i];`
`588`		`- *info = generate_shader(info->name, m_device,`
`589`		`- m_shader_callback, &m_sourcecache);`
	`588`	`+ if(info->name != ""){`
	`589`	`+ *info = generate_shader(info->name, m_device,`
	`590`	`+ m_shader_callback, &m_sourcecache);`
	`591`	`+ }`
`590`	`592`	`}`
`591`	`593`	`}`
`592`	`594`