D3D11: Remove unsized formats from the table.

These cases weren't actually ever hit within ANGLE. BUG=angleproject:1455 Change-Id: I60da3fb9eae91598ddaed5572a4bab0a66345694 Reviewed-on: https://chromium-review.googlesource.com/367691Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

D3D11: Remove unsized formats from the table.
9371f7ab · Jamie Madill · Commit Bot · 30712068 · 9371f7ab · 9371f7ab
Commit 9371f7ab authored Aug 09, 2016 by Jamie Madill Committed by Commit Bot Aug 12, 2016
Showing with 0 additions and 62 deletions

texture_format_map.json src/libANGLE/renderer/d3d/d3d11/texture_format_map.json +0 -3

texture_format_table_autogen.cpp ...ANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp +0 -59

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
+++ b/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
 {
-  "GL_ALPHA": "A8_UNORM",
  "GL_ALPHA16F_EXT": "R16G16B16A16_FLOAT",
  "GL_ALPHA32F_EXT": "R32G32B32A32_FLOAT",
  "GL_ALPHA8_EXT": "A8_UNORM",
@@ -58,12 +57,10 @@
  "GL_DEPTH_COMPONENT32_OES": "D24_UNORM_S8_UINT",
  "GL_ETC1_RGB8_OES": "R8G8B8A8_UNORM",
  "GL_ETC1_RGB8_LOSSY_DECODE_ANGLE": "BC1_UNORM",
-  "GL_LUMINANCE": "R8G8B8A8_UNORM",
  "GL_LUMINANCE16F_EXT": "R16G16B16A16_FLOAT",
  "GL_LUMINANCE32F_EXT": "R32G32B32A32_FLOAT",
  "GL_LUMINANCE8_ALPHA8_EXT": "R8G8B8A8_UNORM",
  "GL_LUMINANCE8_EXT": "R8G8B8A8_UNORM",
-  "GL_LUMINANCE_ALPHA": "R8G8B8A8_UNORM",
  "GL_LUMINANCE_ALPHA16F_EXT": "R16G16B16A16_FLOAT",
  "GL_LUMINANCE_ALPHA32F_EXT": "R32G32B32A32_FLOAT",
  "GL_NONE": "NONE",

--- a/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
@@ -34,37 +34,6 @@ const Format &Format::Get(GLenum internalFormat,
    // clang-format off
    switch (internalFormat)
    {
-        case GL_ALPHA:
-        {
-            if (OnlyFL10Plus(deviceCaps))
-            {
-                static const Format info(GL_ALPHA,
-                                         angle::Format::ID::A8_UNORM,
-                                         DXGI_FORMAT_A8_UNORM,
-                                         DXGI_FORMAT_A8_UNORM,
-                                         DXGI_FORMAT_A8_UNORM,
-                                         DXGI_FORMAT_UNKNOWN,
-                                         DXGI_FORMAT_A8_UNORM,
-                                         GL_RGBA8,
-                                         nullptr,
-                                         deviceCaps);
-                return info;
-            }
-            else
-            {
-                static const Format info(GL_ALPHA,
-                                         angle::Format::ID::R8G8B8A8_UNORM,
-                                         DXGI_FORMAT_R8G8B8A8_UNORM,
-                                         DXGI_FORMAT_R8G8B8A8_UNORM,
-                                         DXGI_FORMAT_R8G8B8A8_UNORM,
-                                         DXGI_FORMAT_UNKNOWN,
-                                         DXGI_FORMAT_R8G8B8A8_UNORM,
-                                         GL_RGBA8,
-                                         nullptr,
-                                         deviceCaps);
-                return info;
-            }
-        }
        case GL_ALPHA16F_EXT:
        {
            static const Format info(GL_ALPHA16F_EXT,
@@ -979,20 +948,6 @@ const Format &Format::Get(GLenum internalFormat,
                                     deviceCaps);
            return info;
        }
-        case GL_LUMINANCE:
-        {
-            static const Format info(GL_LUMINANCE,
-                                     angle::Format::ID::R8G8B8A8_UNORM,
-                                     DXGI_FORMAT_R8G8B8A8_UNORM,
-                                     DXGI_FORMAT_R8G8B8A8_UNORM,
-                                     DXGI_FORMAT_R8G8B8A8_UNORM,
-                                     DXGI_FORMAT_UNKNOWN,
-                                     DXGI_FORMAT_R8G8B8A8_UNORM,
-                                     GL_RGBA8,
-                                     Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>,
-                                     deviceCaps);
-            return info;
-        }
        case GL_LUMINANCE16F_EXT:
        {
            static const Format info(GL_LUMINANCE16F_EXT,
@@ -1049,20 +1004,6 @@ const Format &Format::Get(GLenum internalFormat,
                                     deviceCaps);
            return info;
        }
-        case GL_LUMINANCE_ALPHA:
-        {
-            static const Format info(GL_LUMINANCE_ALPHA,
-                                     angle::Format::ID::R8G8B8A8_UNORM,
-                                     DXGI_FORMAT_R8G8B8A8_UNORM,
-                                     DXGI_FORMAT_R8G8B8A8_UNORM,
-                                     DXGI_FORMAT_R8G8B8A8_UNORM,
-                                     DXGI_FORMAT_UNKNOWN,
-                                     DXGI_FORMAT_R8G8B8A8_UNORM,
-                                     GL_RGBA8,
-                                     nullptr,
-                                     deviceCaps);
-            return info;
-        }
        case GL_LUMINANCE_ALPHA16F_EXT:
        {
            static const Format info(GL_LUMINANCE_ALPHA16F_EXT,