Skip to content

A
angle
Commit 9371f7ab by Jamie Madill Committed by Commit Bot
Options

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: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 30712068
Showing with 0 additions and 62 deletions
src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
{ {
"GL_ALPHA": "A8_UNORM",
"GL_ALPHA16F_EXT": "R16G16B16A16_FLOAT", "GL_ALPHA16F_EXT": "R16G16B16A16_FLOAT",
"GL_ALPHA32F_EXT": "R32G32B32A32_FLOAT", "GL_ALPHA32F_EXT": "R32G32B32A32_FLOAT",
"GL_ALPHA8_EXT": "A8_UNORM", "GL_ALPHA8_EXT": "A8_UNORM",
...@@ -58,12 +57,10 @@ ...@@ -58,12 +57,10 @@
"GL_DEPTH_COMPONENT32_OES": "D24_UNORM_S8_UINT", "GL_DEPTH_COMPONENT32_OES": "D24_UNORM_S8_UINT",
"GL_ETC1_RGB8_OES": "R8G8B8A8_UNORM", "GL_ETC1_RGB8_OES": "R8G8B8A8_UNORM",
"GL_ETC1_RGB8_LOSSY_DECODE_ANGLE": "BC1_UNORM", "GL_ETC1_RGB8_LOSSY_DECODE_ANGLE": "BC1_UNORM",
"GL_LUMINANCE": "R8G8B8A8_UNORM",
"GL_LUMINANCE16F_EXT": "R16G16B16A16_FLOAT", "GL_LUMINANCE16F_EXT": "R16G16B16A16_FLOAT",
"GL_LUMINANCE32F_EXT": "R32G32B32A32_FLOAT", "GL_LUMINANCE32F_EXT": "R32G32B32A32_FLOAT",
"GL_LUMINANCE8_ALPHA8_EXT": "R8G8B8A8_UNORM", "GL_LUMINANCE8_ALPHA8_EXT": "R8G8B8A8_UNORM",
"GL_LUMINANCE8_EXT": "R8G8B8A8_UNORM", "GL_LUMINANCE8_EXT": "R8G8B8A8_UNORM",
"GL_LUMINANCE_ALPHA": "R8G8B8A8_UNORM",
"GL_LUMINANCE_ALPHA16F_EXT": "R16G16B16A16_FLOAT", "GL_LUMINANCE_ALPHA16F_EXT": "R16G16B16A16_FLOAT",
"GL_LUMINANCE_ALPHA32F_EXT": "R32G32B32A32_FLOAT", "GL_LUMINANCE_ALPHA32F_EXT": "R32G32B32A32_FLOAT",
"GL_NONE": "NONE", "GL_NONE": "NONE",
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
...@@ -34,37 +34,6 @@ const Format &Format::Get(GLenum internalFormat, ...@@ -34,37 +34,6 @@ const Format &Format::Get(GLenum internalFormat,
// clang-format off // clang-format off
switch (internalFormat) 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: case GL_ALPHA16F_EXT:
{ {
static const Format info(GL_ALPHA16F_EXT, static const Format info(GL_ALPHA16F_EXT,
...@@ -979,20 +948,6 @@ const Format &Format::Get(GLenum internalFormat, ...@@ -979,20 +948,6 @@ const Format &Format::Get(GLenum internalFormat,
deviceCaps); deviceCaps);
return info; 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: case GL_LUMINANCE16F_EXT:
{ {
static const Format info(GL_LUMINANCE16F_EXT, static const Format info(GL_LUMINANCE16F_EXT,
...@@ -1049,20 +1004,6 @@ const Format &Format::Get(GLenum internalFormat, ...@@ -1049,20 +1004,6 @@ const Format &Format::Get(GLenum internalFormat,
deviceCaps); deviceCaps);
return info; 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: case GL_LUMINANCE_ALPHA16F_EXT:
{ {
static const Format info(GL_LUMINANCE_ALPHA16F_EXT, static const Format info(GL_LUMINANCE_ALPHA16F_EXT,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment