X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=2ff751946528f75e2a39f6a512565231ed10ce8c;hb=bde40be11da83206f3d33a8225963d47a413662e;hp=c670bc1a814ee1002eac71285c9002fe568c1968;hpb=91e2fb59219089ac0f16bc49152c20be42a14cc5;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index c670bc1a..2ff75194 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -986,6 +986,15 @@ void FunctionResolver::visit(FunctionDeclaration &func)
 	vector<FunctionDeclaration *> &decls = declarations[key];
 	if(func.definition==&func)
 	{
+		if(stage_decl && stage_decl->definition)
+		{
+			if(!func.overrd)
+				stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, func.source, func.line,
+					format("Overriding function '%s' without the override keyword is deprecated", key)));
+			if(!stage_decl->definition->virtua)
+				stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, func.source, func.line,
+					format("Overriding function '%s' not declared as virtual is deprecated", key)));
+		}
 		stage_decl = &func;
 
 		// Set all previous declarations to use this definition.