commit 0e64dd6dc05a4d3e31f6cbc69ceeafc4a863a65e
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed May 11 15:36:37 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed May 11 15:36:37 2011 +0000
tree 2069c899e1f5ba86418b65a2fe94a0b99e94ba3e
parent af29cac91acdc574464e3966bf9da5c8cf24acd2

Rename SamplerType to TextureType (refactoring).

Issue=95
TRAC #16568
Signed-off-by: Daniel Koch
Author: Nicolas Capens

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

src/libGLESv2/ResourceManager.h

diff --git a/src/libGLESv2/ResourceManager.h b/src/libGLESv2/ResourceManager.h
index d83bd7f..7baab15 100644
--- a/src/libGLESv2/ResourceManager.h
+++ b/src/libGLESv2/ResourceManager.h
@@ -26,12 +26,12 @@
 class Texture;
 class Renderbuffer;
 
-enum SamplerType
+enum TextureType
 {
-    SAMPLER_2D,
-    SAMPLER_CUBE,
+    TEXTURE_2D,
+    TEXTURE_CUBE,
 
-    SAMPLER_TYPE_COUNT
+    TEXTURE_TYPE_COUNT
 };
 
 class ResourceManager
@@ -64,7 +64,7 @@
     void setRenderbuffer(GLuint handle, Renderbuffer *renderbuffer);
 
     void checkBufferAllocation(unsigned int buffer);
-    void checkTextureAllocation(GLuint texture, SamplerType type);
+    void checkTextureAllocation(GLuint texture, TextureType type);
     void checkRenderbufferAllocation(GLuint renderbuffer);
 
   private: