@@ -767,22 +767,22 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype,
767767 if (g_settings->getBool (" tone_mapping" ))
768768 shaders_header += " #define ENABLE_TONE_MAPPING\n " ;
769769
770- if (pixel_program != " " )
771- pixel_program = shaders_header + pixel_program;
772- if (vertex_program != " " )
773- vertex_program = shaders_header + vertex_program;
774- if (geometry_program != " " )
775- geometry_program = shaders_header + geometry_program;
776770 // Call addHighLevelShaderMaterial() or addShaderMaterial()
777771 const c8* vertex_program_ptr = 0 ;
778772 const c8* pixel_program_ptr = 0 ;
779773 const c8* geometry_program_ptr = 0 ;
780- if (vertex_program != " " )
774+ if (!vertex_program.empty ()) {
775+ pixel_program = shaders_header + pixel_program;
781776 vertex_program_ptr = vertex_program.c_str ();
782- if (pixel_program != " " )
777+ }
778+ if (!pixel_program.empty ()) {
779+ vertex_program = shaders_header + vertex_program;
783780 pixel_program_ptr = pixel_program.c_str ();
784- if (geometry_program != " " )
781+ }
782+ if (!geometry_program.empty ()) {
783+ geometry_program = shaders_header + geometry_program;
785784 geometry_program_ptr = geometry_program.c_str ();
785+ }
786786 s32 shadermat = -1 ;
787787 if (is_highlevel){
788788 infostream<<" Compiling high level shaders for " <<name<<std::endl;
0 commit comments