commit 6cf8e1b906ebfcda10f0f1cc673df6688c81e0e0
author Geoff Lang <geofflang@chromium.org> Thu Jul 03 13:03:57 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Tue Jul 22 19:52:37 2014 +0000
tree 594caa89f6836a377dcc46fcbd27171e4f3c8c51
parent ad8636ee810e0865cd3a7cbb45372546d36cc870

Reduce the number of TextureFormatCaps members.

Since GL has no notion of texture formats that can be used for different
types of textures, merge the TextureFormatCaps texture support members.

Also merge the various renderability members since the texture type is
enough to determine what type of renderable a format is.

BUG=angle:658

Change-Id: I7cba50b147fcca8f3880d65c06c57df9c65ed19c
Reviewed-on: https://chromium-review.googlesource.com/206830
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/renderer/d3d/TextureD3D.cpp

diff --git a/src/libGLESv2/renderer/d3d/TextureD3D.cpp b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
index d333b32..167ec4e 100644
--- a/src/libGLESv2/renderer/d3d/TextureD3D.cpp
+++ b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
@@ -449,7 +449,7 @@
         return false;
     }
 
-    if (!mRenderer->getRendererTextureCaps().get(getInternalFormat(0)).filtering)
+    if (!mRenderer->getRendererTextureCaps().get(getInternalFormat(0)).filterable)
     {
         if (samplerState.magFilter != GL_NEAREST ||
             (samplerState.minFilter != GL_NEAREST && samplerState.minFilter != GL_NEAREST_MIPMAP_NEAREST))
@@ -1027,7 +1027,7 @@
     bool mipmapping = IsMipmapFiltered(samplerState);
 
     // TODO(geofflang): use context's texture caps
-    if (!mRenderer->getRendererTextureCaps().get(getInternalFormat(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0)).filtering)
+    if (!mRenderer->getRendererTextureCaps().get(getInternalFormat(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0)).filterable)
     {
         if (samplerState.magFilter != GL_NEAREST ||
             (samplerState.minFilter != GL_NEAREST && samplerState.minFilter != GL_NEAREST_MIPMAP_NEAREST))
@@ -1649,7 +1649,7 @@
     }
 
     // TODO(geofflang): use context's texture caps
-    if (!mRenderer->getRendererTextureCaps().get(getInternalFormat(0)).filtering)
+    if (!mRenderer->getRendererTextureCaps().get(getInternalFormat(0)).filterable)
     {
         if (samplerState.magFilter != GL_NEAREST ||
             (samplerState.minFilter != GL_NEAREST && samplerState.minFilter != GL_NEAREST_MIPMAP_NEAREST))