commit 909b90ce8071dd1e7bab4fcc724aa6294e791454
author Geoff Lang <geofflang@chromium.org> Mon Jan 12 14:07:26 2015 -0500
committer Geoff Lang <geofflang@chromium.org> Fri Jan 16 20:40:27 2015 +0000
tree 701bcea3610654cf079b65e2611037f693c0e7ee
parent abf6dadd4983531c5cb8e28c0e3efbda3d283f0e

Use the ImageIndex class for indexing the Texture size information.

BUG=angle:681

Change-Id: I0c8d1c04ca8eefb9b618ee6635c0643d162c0cc1
Reviewed-on: https://chromium-review.googlesource.com/240241
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Texture.cpp

diff --git a/src/libANGLE/Texture.cpp b/src/libANGLE/Texture.cpp
index 105eaca..a59cf68 100644
--- a/src/libANGLE/Texture.cpp
+++ b/src/libANGLE/Texture.cpp
@@ -86,25 +86,25 @@
 size_t Texture::getWidth(GLenum target, size_t level) const
 {
     ASSERT(target == mTarget || (mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
-    return getImageDesc(ImageIdentifier(target, level)).size.width;
+    return getImageDesc(ImageIndex::MakeGeneric(target, level)).size.width;
 }
 
 size_t Texture::getHeight(GLenum target, size_t level) const
 {
     ASSERT(target == mTarget || (mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
-    return getImageDesc(ImageIdentifier(target, level)).size.height;
+    return getImageDesc(ImageIndex::MakeGeneric(target, level)).size.height;
 }
 
 size_t Texture::getDepth(GLenum target, size_t level) const
 {
     ASSERT(target == mTarget || (mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
-    return getImageDesc(ImageIdentifier(target, level)).size.depth;
+    return getImageDesc(ImageIndex::MakeGeneric(target, level)).size.depth;
 }
 
 GLenum Texture::getInternalFormat(GLenum target, size_t level) const
 {
     ASSERT(target == mTarget || (mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
-    return getImageDesc(ImageIdentifier(target, level)).internalFormat;
+    return getImageDesc(ImageIndex::MakeGeneric(target, level)).internalFormat;
 }
 
 bool Texture::isSamplerComplete(const SamplerState &samplerState, const Data &data) const
@@ -244,7 +244,7 @@
 
     releaseTexImage();
 
-    setImageDesc(ImageIdentifier(target, level), ImageDesc(size, GetSizedInternalFormat(internalFormat, type)));
+    setImageDesc(ImageIndex::MakeGeneric(target, level), ImageDesc(size, GetSizedInternalFormat(internalFormat, type)));
 
     return Error(GL_NO_ERROR);
 }
@@ -270,7 +270,7 @@
 
     releaseTexImage();
 
-    setImageDesc(ImageIdentifier(target, level), ImageDesc(size, GetSizedInternalFormat(internalFormat, GL_UNSIGNED_BYTE)));
+    setImageDesc(ImageIndex::MakeGeneric(target, level), ImageDesc(size, GetSizedInternalFormat(internalFormat, GL_UNSIGNED_BYTE)));
 
     return Error(GL_NO_ERROR);
 }
@@ -296,7 +296,7 @@
 
     releaseTexImage();
 
-    setImageDesc(ImageIdentifier(target, level), ImageDesc(Extents(sourceArea.width, sourceArea.height, 1),
+    setImageDesc(ImageIndex::MakeGeneric(target, level), ImageDesc(Extents(sourceArea.width, sourceArea.height, 1),
                                                                    GetSizedInternalFormat(internalFormat, GL_UNSIGNED_BYTE)));
 
     return Error(GL_NO_ERROR);
@@ -340,7 +340,7 @@
 
     releaseTexImage();
 
-    ImageIdentifier baseLevel(getBaseImageTarget(), 0);
+    ImageIndex baseLevel = ImageIndex::MakeGeneric(getBaseImageTarget(), 0);
     const ImageDesc &baseImageInfo = getImageDesc(baseLevel);
     size_t mipLevels = log2(std::max(std::max(baseImageInfo.size.width, baseImageInfo.size.height), baseImageInfo.size.depth)) + 1;
     setImageDescChain(mipLevels, baseImageInfo.size, baseImageInfo.internalFormat);
@@ -361,32 +361,16 @@
         {
             for (size_t face = FirstCubeMapTextureTarget; face <= LastCubeMapTextureTarget; face++)
             {
-                setImageDesc(ImageIdentifier(face, level), levelInfo);
+                setImageDesc(ImageIndex::MakeGeneric(face, level), levelInfo);
             }
         }
         else
         {
-            setImageDesc(ImageIdentifier(mTarget, level), levelInfo);
+            setImageDesc(ImageIndex::MakeGeneric(mTarget, level), levelInfo);
         }
     }
 }
 
-Texture::ImageIdentifier::ImageIdentifier()
-    : ImageIdentifier(GL_TEXTURE_2D, 0)
-{
-}
-
-Texture::ImageIdentifier::ImageIdentifier(GLenum target, size_t level)
-    : target(target),
-      level(level)
-{
-}
-
-bool Texture::ImageIdentifier::operator<(const ImageIdentifier &other) const
-{
-    return (target != other.target) ? target < other.target : level < other.level;
-}
-
 Texture::ImageDesc::ImageDesc()
     : ImageDesc(Extents(0, 0, 0), GL_NONE)
 {
@@ -398,14 +382,14 @@
 {
 }
 
-const Texture::ImageDesc &Texture::getImageDesc(const ImageIdentifier& index) const
+const Texture::ImageDesc &Texture::getImageDesc(const ImageIndex &index) const
 {
     static const Texture::ImageDesc defaultDesc;
     ImageDescMap::const_iterator iter = mImageDescs.find(index);
     return (iter != mImageDescs.end()) ? iter->second : defaultDesc;
 }
 
-void Texture::setImageDesc(const ImageIdentifier& index, const ImageDesc &desc)
+void Texture::setImageDesc(const ImageIndex &index, const ImageDesc &desc)
 {
     mImageDescs[index] = desc;
 }