From 922a30ee47edbd6255cd6cbea0f89f21c607094c Mon Sep 17 00:00:00 2001 From: Kahrl Date: Fri, 5 Jul 2013 04:24:05 +0200 Subject: [PATCH] Don't rebuild the dummy shader (less SourceShaderCache warning spam) Also write something about rebuilding shaders to infostream in Client::afterContentReceived() --- src/client.cpp | 1 + src/shader.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 5e682aaa3..ccd2034fc 100644 --- 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"<rebuildShaders(); // Update node aliases diff --git a/src/shader.cpp b/src/shader.cpp index 9cef7f353..58042e651 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -585,8 +585,10 @@ void ShaderSource::rebuildShaders() // Recreate shaders for(u32 i=0; iname, m_device, - m_shader_callback, &m_sourcecache); + if(info->name != ""){ + *info = generate_shader(info->name, m_device, + m_shader_callback, &m_sourcecache); + } } } -- 2.25.1