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/Program.h

diff --git a/src/libGLESv2/Program.h b/src/libGLESv2/Program.h
index 191a113..c1e87c9 100644
--- a/src/libGLESv2/Program.h
+++ b/src/libGLESv2/Program.h
@@ -73,7 +73,7 @@
     int getSemanticIndex(int attributeIndex);
 
     GLint getSamplerMapping(unsigned int samplerIndex);
-    SamplerType getSamplerType(unsigned int samplerIndex);
+    TextureType getSamplerTextureType(unsigned int samplerIndex);
 
     GLint getUniformLocation(const char *name, bool decorated);
     bool setUniform1fv(GLint location, GLsizei count, const GLfloat *v);
@@ -188,7 +188,7 @@
     {
         bool active;
         GLint logicalTextureUnit;
-        SamplerType type;
+        TextureType textureType;
     };
 
     Sampler mSamplers[MAX_TEXTURE_IMAGE_UNITS];