Added profiling blocks to shader loading.

Renamed Engine::DumpProfilingData() to Engine::DumpProfiler() to be shorter to type on the console.

Docs/ScriptAPI.dox

@@ -5851,7 +5851,7 @@ Methods:<br>
 - void SendEvent(const String&, VariantMap& arg1 = VariantMap ( ))
 - void RunFrame()
 - void Exit()
-- void DumpProfilingData()
+- void DumpProfiler()
 - void DumpResources()
 - void DumpMemory()
 - Console@ CreateConsole()

Engine/Engine/Engine.cpp

@@ -377,7 +377,7 @@ void Engine::Exit()
     exiting_ = true;
 }
 
-void Engine::DumpProfilingData()
+void Engine::DumpProfiler()
 {
     Profiler* profiler = GetSubsystem<Profiler>();
     if (profiler)

Engine/Engine/Engine.h

@@ -63,7 +63,7 @@ public:
     /// Close the application window and set the exit flag.
     void Exit();
     /// Dump profiling information to the log.
-    void DumpProfilingData();
+    void DumpProfiler();
     /// Dump information of all resources to the log.
     void DumpResources();
     /// Dump information of all memory allocations to the log. Supported in MSVC debug mode only.

Engine/Engine/EngineAPI.cpp

@@ -100,7 +100,7 @@ static void RegisterEngine(asIScriptEngine* engine)
     RegisterObject<Engine>(engine, "Engine");
     engine->RegisterObjectMethod("Engine", "void RunFrame()", asMETHOD(Engine, RunFrame), asCALL_THISCALL);
     engine->RegisterObjectMethod("Engine", "void Exit()", asMETHOD(Engine, Exit), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Engine", "void DumpProfilingData()", asMETHOD(Engine, DumpProfilingData), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Engine", "void DumpProfiler()", asMETHOD(Engine, DumpProfiler), asCALL_THISCALL);
     engine->RegisterObjectMethod("Engine", "void DumpResources()", asMETHOD(Engine, DumpResources), asCALL_THISCALL);
     engine->RegisterObjectMethod("Engine", "void DumpMemory()", asMETHOD(Engine, DumpMemory), asCALL_THISCALL);
     engine->RegisterObjectMethod("Engine", "Console@+ CreateConsole()", asMETHOD(Engine, CreateConsole), asCALL_THISCALL);

Engine/Graphics/Direct3D9/D3D9Graphics.cpp

@@ -941,7 +941,7 @@ void Graphics::SetShaders(ShaderVariation* vs, ShaderVariation* ps)
             if (!vs->IsFailed())
             {
                 PROFILE(CreateVertexShader);
-
+                
                 bool success = vs->Create();
                 if (success)
                     LOGDEBUG("Created vertex shader " + vs->GetName());

Engine/Graphics/Direct3D9/D3D9Shader.cpp

@@ -91,6 +91,8 @@ bool Shader::Load(Deserializer& source)
     File* sourceFile = dynamic_cast<File*>(&source);
     if (sourceFile && !sourceFile->IsPackaged())
     {
+        PROFILE(CheckTimestamps);
+        
         FileSystem* fileSystem = GetSubsystem<FileSystem>();
         
         if (fileSystem && !fileSystem->HasRegisteredPaths())
@@ -159,15 +161,19 @@ bool Shader::Load(Deserializer& source)
         globalDefineValues.Push("1");
     }
     
-    if (!vsParser_.Parse(VS, shaders, globalDefines, globalDefineValues))
     {
-        LOGERROR("VS: " + vsParser_.GetErrorMessage());
-        return false;
-    }
-    if (!psParser_.Parse(PS, shaders, globalDefines, globalDefineValues))
-    {
-        LOGERROR("PS: " + psParser_.GetErrorMessage());
-        return false;
+        PROFILE(ParseShaderDefinition);
+        
+        if (!vsParser_.Parse(VS, shaders, globalDefines, globalDefineValues))
+        {
+            LOGERROR("VS: " + vsParser_.GetErrorMessage());
+            return false;
+        }
+        if (!psParser_.Parse(PS, shaders, globalDefines, globalDefineValues))
+        {
+            LOGERROR("PS: " + psParser_.GetErrorMessage());
+            return false;
+        }
     }
     
     // If variations had already been created, clear their bytecode

Engine/Graphics/Octree.cpp

@@ -560,7 +560,7 @@ void Octree::UpdateDrawables(const FrameInfo& frame)
     if (drawableUpdates_.Empty())
         return;
     
-    PROFILE(AnimateDrawables);
+    PROFILE(UpdateDrawables);
     
     Scene* scene = GetScene();
     WorkQueue* queue = GetSubsystem<WorkQueue>();

Engine/Graphics/OpenGL/OGLGraphics.cpp

@@ -967,6 +967,8 @@ void Graphics::SetShaders(ShaderVariation* vs, ShaderVariation* ps)
         else
         {
             // Link a new combination
+            PROFILE(LinkShaders);
+            
             SharedPtr<ShaderProgram> newProgram(new ShaderProgram(this, vs, ps));
             if (newProgram->Link())
             {

Engine/Graphics/OpenGL/OGLShader.cpp

@@ -80,24 +80,32 @@ bool Shader::Load(Deserializer& source)
         return false;
     }
     
-    if (!vsParser_.Parse(VS, shaders))
     {
-        LOGERROR("VS: " + vsParser_.GetErrorMessage());
-        return false;
-    }
-    if (!psParser_.Parse(PS, shaders))
-    {
-        LOGERROR("PS: " + psParser_.GetErrorMessage());
-        return false;
+        PROFILE(ParseShaderDefinition);
+        
+        if (!vsParser_.Parse(VS, shaders))
+        {
+            LOGERROR("VS: " + vsParser_.GetErrorMessage());
+            return false;
+        }
+        if (!psParser_.Parse(PS, shaders))
+        {
+            LOGERROR("PS: " + psParser_.GetErrorMessage());
+            return false;
+        }
     }
     
     String path, fileName, extension;
     SplitPath(GetName(), path, fileName, extension);
     
-    if (!ProcessSource(vsSourceCode_, vsSourceCodeLength_, path + fileName + ".vert"))
-        return false;
-    if (!ProcessSource(psSourceCode_, psSourceCodeLength_, path + fileName + ".frag"))
-        return false;
+    {
+        PROFILE(LoadShaderSource);
+        
+        if (!ProcessSource(vsSourceCode_, vsSourceCodeLength_, path + fileName + ".vert"))
+            return false;
+        if (!ProcessSource(psSourceCode_, psSourceCodeLength_, path + fileName + ".frag"))
+            return false;
+    }
     
     // If variations had already been created, release them and set new source code
     /// \todo Should also update defines