Updating resource types on Context (Framebuffers and Fences) to use hash_map, as…

Updating resource types on Context (Framebuffers and Fences) to use hash_map, as done to other types in r615. Issue=148 Signed-off-by: Daniel Koch git-svn-id: https://angleproject.googlecode.com/svn/trunk@624 736b8ea6-26fd-11df-bfd4-992fa37f6226

Updating resource types on Context (Framebuffers and Fences) to use hash_map, as…
a9d0b768 · benvanik@google.com · 1a23334f · a9d0b768 · a9d0b768
Commit a9d0b768 authored Apr 28, 2011 by benvanik@google.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

version.h src/common/version.h +1 -1

Context.h src/libGLESv2/Context.h +3 -2

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 0
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 623
+#define BUILD_REVISION 624

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libGLESv2/Context.h
+++ b/src/libGLESv2/Context.h
@@ -18,6 +18,7 @@
 #include <d3d9.h>

 #include <map>
+#include <hash_map>

 #include "common/angleutils.h"
 #include "libGLESv2/ResourceManager.h"
@@ -479,11 +480,11 @@ class Context
    BindingPointer<Texture2D> mTexture2DZero;
    BindingPointer<TextureCubeMap> mTextureCubeMapZero;

-    typedef std::map<GLuint, Framebuffer*> FramebufferMap;
+    typedef stdext::hash_map<GLuint, Framebuffer*> FramebufferMap;
    FramebufferMap mFramebufferMap;
    HandleAllocator mFramebufferHandleAllocator;

-    typedef std::map<GLuint, Fence*> FenceMap;
+    typedef stdext::hash_map<GLuint, Fence*> FenceMap;
    FenceMap mFenceMap;
    HandleAllocator mFenceHandleAllocator;