D3D11: Remove X24G8 special format.

This special format means we're using a depth/stencil format with only the stencil channel being used. We can just use a normal D24S8 format here, there's pretty much no difference. BUG=angleproject:1455 Change-Id: Id304094b92814f38930209a703733190ad8e8410 Reviewed-on: https://chromium-review.googlesource.com/359086Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

D3D11: Remove X24G8 special format.
6bbdce5b · Jamie Madill · Commit Bot · 7a074768 · 6bbdce5b · 6bbdce5b
Commit 6bbdce5b authored Aug 02, 2016 by Jamie Madill Committed by Commit Bot Aug 02, 2016
4 changed files
--- a/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
+++ b/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
@@ -447,14 +447,6 @@
    "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
    "glInternalFormat": "GL_SRGB8_ALPHA8"
  },
-  "ANGLE_FORMAT_X24_TYPELESS_G8_UINT": {
-    "texFormat": "DXGI_FORMAT_R24G8_TYPELESS",
-    "srvFormat": "DXGI_FORMAT_X24_TYPELESS_G8_UINT",
-    "dsvFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
-    "channels": "ds",
-    "bits": { "depth": 24, "stencil": 8 },
-    "glInternalFormat": "GL_DEPTH24_STENCIL8_OES"
-  },
  "ANGLE_FORMAT_R16_UNORM": {
    "texFormat": "DXGI_FORMAT_R16_UNORM",
    "srvFormat": "DXGI_FORMAT_R16_UNORM",

--- a/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
+++ b/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
@@ -171,7 +171,7 @@
  "GL_SRGB8": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB",
  "GL_SRGB8_ALPHA8": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB",
  "GL_STENCIL_INDEX8": {
-    "OnlyFL10Plus": "ANGLE_FORMAT_X24_TYPELESS_G8_UINT",
+    "OnlyFL10Plus": "ANGLE_FORMAT_D24_UNORM_S8_UINT_FL10",
    "OnlyFL9_3": "ANGLE_FORMAT_D24_UNORM_S8_UINT_FL9_3"
  },
  "GL_R16_EXT": "ANGLE_FORMAT_R16_UNORM",

--- a/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
@@ -1005,21 +1005,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat)
                                                   ReadColor<R9G9B9E5, GLfloat>);
            return formatInfo;
        }
-        case ANGLE_FORMAT_X24_TYPELESS_G8_UINT:
-        {
-            static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_X24_TYPELESS_G8_UINT,
-                                                   GL_DEPTH24_STENCIL8_OES,
-                                                   GL_DEPTH24_STENCIL8_OES,
-                                                   DXGI_FORMAT_R24G8_TYPELESS,
-                                                   DXGI_FORMAT_X24_TYPELESS_G8_UINT,
-                                                   DXGI_FORMAT_UNKNOWN,
-                                                   DXGI_FORMAT_D24_UNORM_S8_UINT,
-                                                   DXGI_FORMAT_X24_TYPELESS_G8_UINT,
-                                                   ANGLE_FORMAT_R32G32B32A32_FLOAT,
-                                                   nullptr,
-                                                   nullptr);
-            return formatInfo;
-        }

        default:
            break;
@@ -2148,7 +2133,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
            if (OnlyFL10Plus(renderer11DeviceCaps))
            {
                static const TextureFormat textureFormat(internalFormat,
-                                                         ANGLE_FORMAT_X24_TYPELESS_G8_UINT,
+                                                         ANGLE_FORMAT_D24_UNORM_S8_UINT_FL10,
                                                         nullptr);
                return textureFormat;
            }

--- a/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.h
+++ b/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.h
@@ -69,8 +69,7 @@ enum ANGLEFormat
    ANGLE_FORMAT_R8_SNORM,
    ANGLE_FORMAT_R8_UINT,
    ANGLE_FORMAT_R8_UNORM,
-    ANGLE_FORMAT_R9G9B9E5_SHAREDEXP,
-    ANGLE_FORMAT_X24_TYPELESS_G8_UINT
+    ANGLE_FORMAT_R9G9B9E5_SHAREDEXP
 };

 }  // namespace d3d11