ソースを参照

Use HashMap instead of Map for the shader variations.

Lasse Öörni 14 年 前
コミット
1c06a3b463

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9Shader.cpp

@@ -150,7 +150,7 @@ bool Shader::Load(Deserializer& source)
 ShaderVariation* Shader::GetVariation(const String& name)
 ShaderVariation* Shader::GetVariation(const String& name)
 {
 {
     StringHash nameHash(name);
     StringHash nameHash(name);
-    Map<StringHash, SharedPtr<ShaderVariation> >::Iterator i = variations_.Find(nameHash);
+    HashMap<StringHash, SharedPtr<ShaderVariation> >::Iterator i = variations_.Find(nameHash);
     if (i != variations_.End())
     if (i != variations_.End())
         return i->second_;
         return i->second_;
     else
     else

+ 2 - 1
Engine/Graphics/Direct3D9/D3D9Shader.h

@@ -23,6 +23,7 @@
 
 
 #pragma once
 #pragma once
 
 
+#include "HashMap.h"
 #include "Resource.h"
 #include "Resource.h"
 
 
 class ShaderVariation;
 class ShaderVariation;
@@ -61,5 +62,5 @@ private:
     /// Shader Model 3 flag.
     /// Shader Model 3 flag.
     bool isSM3_;
     bool isSM3_;
     /// Shader variations. Will be in an unloaded state until requested.
     /// Shader variations. Will be in an unloaded state until requested.
-    Map<StringHash, SharedPtr<ShaderVariation> > variations_;
+    HashMap<StringHash, SharedPtr<ShaderVariation> > variations_;
 };
 };

+ 1 - 1
Engine/Graphics/OpenGL/OGLShader.cpp

@@ -98,7 +98,7 @@ bool Shader::Load(Deserializer& source)
 ShaderVariation* Shader::GetVariation(const String& name)
 ShaderVariation* Shader::GetVariation(const String& name)
 {
 {
     StringHash nameHash(name);
     StringHash nameHash(name);
-    Map<StringHash, SharedPtr<ShaderVariation> >::Iterator i = variations_.Find(nameHash);
+    HashMap<StringHash, SharedPtr<ShaderVariation> >::Iterator i = variations_.Find(nameHash);
     if (i != variations_.End())
     if (i != variations_.End())
         return i->second_;
         return i->second_;
     else
     else

+ 3 - 2
Engine/Graphics/OpenGL/OGLShader.h

@@ -23,8 +23,9 @@
 
 
 #pragma once
 #pragma once
 
 
-#include "Resource.h"
 #include "ArrayPtr.h"
 #include "ArrayPtr.h"
+#include "HashMap.h"
+#include "Resource.h"
 
 
 class ShaderVariation;
 class ShaderVariation;
 
 
@@ -62,5 +63,5 @@ private:
     /// Source code length.
     /// Source code length.
     unsigned sourceCodeLength_;
     unsigned sourceCodeLength_;
     /// Shader variations. Will be in an unloaded state until requested.
     /// Shader variations. Will be in an unloaded state until requested.
-    Map<StringHash, SharedPtr<ShaderVariation> > variations_;
+    HashMap<StringHash, SharedPtr<ShaderVariation> > variations_;
 };
 };