commit cbf727aeb4669eeaaff8cf7a2a1b1c2749d78620
author Geoff Lang <geofflang@chromium.org> Mon Feb 10 12:50:45 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Tue Feb 11 16:47:30 2014 +0000
tree e0282e35fbb2f09d158803aade2ad9d64788920d
parent 03ef7406ded9a9d39a83339d110d9a05a8debe1c

Remove references to D3D formats in the Texture class.

Change-Id: I67add42cc69ec372840c67656bd2c77c623b23d0
Reviewed-on: https://chromium-review.googlesource.com/185567
Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index 6e3fe6b..76f1dd2 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -471,7 +471,7 @@
     if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS)
         return mImageArray[level]->getActualFormat();
     else
-        return D3DFMT_UNKNOWN;
+        return GL_NONE;
 }
 
 void Texture2D::redefineImage(GLint level, GLenum internalformat, GLsizei width, GLsizei height)
@@ -1103,7 +1103,7 @@
     if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS)
         return mImageArray[targetToIndex(target)][level]->getActualFormat();
     else
-        return D3DFMT_UNKNOWN;
+        return GL_NONE;
 }
 
 void TextureCubeMap::setImagePosX(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels)
@@ -1744,7 +1744,7 @@
 
 GLenum Texture3D::getActualFormat(GLint level) const
 {
-    return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mImageArray[level]->getActualFormat() : D3DFMT_UNKNOWN;
+    return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mImageArray[level]->getActualFormat() : GL_NONE;
 }
 
 bool Texture3D::isCompressed(GLint level) const
@@ -2290,7 +2290,7 @@
 
 GLenum Texture2DArray::getActualFormat(GLint level) const
 {
-    return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS && mLayerCounts[level] > 0) ? mImageArray[level][0]->getActualFormat() : D3DFMT_UNKNOWN;
+    return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS && mLayerCounts[level] > 0) ? mImageArray[level][0]->getActualFormat() : GL_NONE;
 }
 
 bool Texture2DArray::isCompressed(GLint level) const