commit ba0570efef84d98117e1acb3762b9b58652c516a
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 18:07:39 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 18:07:39 2012 +0000
tree 83d404ae726e2036a9e6f3bfab79a122be31424d
parent ebf139fe6f43719ea599457776209f3064fabb95

Move sampler state setting to the Renderer

Trac #21727

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1336 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/ResourceManager.h

diff --git a/src/libGLESv2/ResourceManager.h b/src/libGLESv2/ResourceManager.h
index ae4f1b0..3c9c568 100644
--- a/src/libGLESv2/ResourceManager.h
+++ b/src/libGLESv2/ResourceManager.h
@@ -20,6 +20,7 @@
 #endif
 
 #include "common/angleutils.h"
+#include "libGLESv2/EnumTypes.h"
 #include "libGLESv2/HandleAllocator.h"
 
 namespace gl
@@ -30,21 +31,6 @@
 class Texture;
 class Renderbuffer;
 
-enum TextureType
-{
-    TEXTURE_2D,
-    TEXTURE_CUBE,
-
-    TEXTURE_TYPE_COUNT,
-    TEXTURE_UNKNOWN
-};
-
-enum SamplerType
-{
-    SAMPLER_PIXEL,
-    SAMPLER_VERTEX
-};
-
 class ResourceManager
 {
   public: