Skip to content

A
angle
Commit 7a074768 by Jamie Madill Committed by Commit Bot
Options

D3D11: Remove 'non-renderable' texture formats.

The only difference between the NONRENDERABLE and normal versions of the formats is the rtvFormat is blank for non-renderable. The only place that I can see we check rtvFormat to make a decision is in TextureStorage11::GetTextureBindFlags. The rtvFormat here isn't necessary because we also check the 'renderTarget' flag, which won't be true for compressed formats at any time. BUG=angleproject:1455 Change-Id: Icbb438d336e67b80c44a0ab8de995a32b92e451e Reviewed-on: https://chromium-review.googlesource.com/359085Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 00d6796a
Showing with 24 additions and 168 deletions
src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
...@@ -56,14 +56,6 @@ ...@@ -56,14 +56,6 @@
"bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 }, "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
"glInternalFormat": "GL_BGRA8_EXT" "glInternalFormat": "GL_BGRA8_EXT"
}, },
"ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE": {
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"channels": "rgba",
"componentType": "unorm",
"bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
"glInternalFormat": "GL_RGBA8"
},
"ANGLE_FORMAT_BC1_UNORM": { "ANGLE_FORMAT_BC1_UNORM": {
"texFormat": "DXGI_FORMAT_BC1_UNORM", "texFormat": "DXGI_FORMAT_BC1_UNORM",
"srvFormat": "DXGI_FORMAT_BC1_UNORM", "srvFormat": "DXGI_FORMAT_BC1_UNORM",
...@@ -88,30 +80,6 @@ ...@@ -88,30 +80,6 @@
"swizzleFormat": "ANGLE_FORMAT_R8G8B8A8_UNORM", "swizzleFormat": "ANGLE_FORMAT_R8G8B8A8_UNORM",
"glInternalFormat": "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE" "glInternalFormat": "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE"
}, },
"ANGLE_FORMAT_R8_SNORM_NONRENDERABLE": {
"texFormat": "DXGI_FORMAT_R8_SNORM",
"srvFormat": "DXGI_FORMAT_R8_SNORM",
"channels": "r",
"componentType": "snorm",
"bits": { "red": 8 },
"glInternalFormat": "GL_R8_SNORM"
},
"ANGLE_FORMAT_R8G8_SNORM_NONRENDERABLE": {
"texFormat": "DXGI_FORMAT_R8G8_SNORM",
"srvFormat": "DXGI_FORMAT_R8G8_SNORM",
"channels": "rg",
"componentType": "snorm",
"bits": { "red": 8, "green": 8 },
"glInternalFormat": "GL_RG8_SNORM"
},
"ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE": {
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"channels": "rgba",
"componentType": "unorm",
"bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
"glInternalFormat": "GL_SRGB8_ALPHA8"
},
"ANGLE_FORMAT_D24_UNORM_S8_UINT_FL10": { "ANGLE_FORMAT_D24_UNORM_S8_UINT_FL10": {
"texFormat": "DXGI_FORMAT_R24G8_TYPELESS", "texFormat": "DXGI_FORMAT_R24G8_TYPELESS",
"srvFormat": "DXGI_FORMAT_R24_UNORM_X8_TYPELESS", "srvFormat": "DXGI_FORMAT_R24_UNORM_X8_TYPELESS",
...@@ -224,14 +192,6 @@ ...@@ -224,14 +192,6 @@
"bits": { "red": 32 }, "bits": { "red": 32 },
"glInternalFormat": "GL_R32UI" "glInternalFormat": "GL_R32UI"
}, },
"ANGLE_FORMAT_R8_UNORM_NONRENDERABLE": {
"texFormat": "DXGI_FORMAT_R8_UNORM",
"srvFormat": "DXGI_FORMAT_R8_UNORM",
"channels": "r",
"componentType": "unorm",
"bits": { "red": 8 },
"glInternalFormat": "GL_R8"
},
"ANGLE_FORMAT_R8_UNORM": { "ANGLE_FORMAT_R8_UNORM": {
"texFormat": "DXGI_FORMAT_R8_UNORM", "texFormat": "DXGI_FORMAT_R8_UNORM",
"srvFormat": "DXGI_FORMAT_R8_UNORM", "srvFormat": "DXGI_FORMAT_R8_UNORM",
...@@ -330,14 +290,6 @@ ...@@ -330,14 +290,6 @@
"bits": { "red": 8, "green": 8 }, "bits": { "red": 8, "green": 8 },
"glInternalFormat": "GL_RG8" "glInternalFormat": "GL_RG8"
}, },
"ANGLE_FORMAT_R8G8_UNORM_NONRENDERABLE": {
"texFormat": "DXGI_FORMAT_R8G8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8_UNORM",
"channels": "rg",
"componentType": "unorm",
"bits": { "red": 8, "green": 8 },
"glInternalFormat": "GL_RG8"
},
"ANGLE_FORMAT_R8G8_SINT": { "ANGLE_FORMAT_R8G8_SINT": {
"texFormat": "DXGI_FORMAT_R8G8_SINT", "texFormat": "DXGI_FORMAT_R8G8_SINT",
"srvFormat": "DXGI_FORMAT_R8G8_SINT", "srvFormat": "DXGI_FORMAT_R8G8_SINT",
......
src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
...@@ -15,19 +15,19 @@ ...@@ -15,19 +15,19 @@
"GL_BGRA8_EXT": "ANGLE_FORMAT_B8G8R8A8_UNORM", "GL_BGRA8_EXT": "ANGLE_FORMAT_B8G8R8A8_UNORM",
"GL_BGRA_EXT": "ANGLE_FORMAT_B8G8R8A8_UNORM", "GL_BGRA_EXT": "ANGLE_FORMAT_B8G8R8A8_UNORM",
"GL_COMPRESSED_R11_EAC": { "GL_COMPRESSED_R11_EAC": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8_UNORM_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8_UNORM"
}, },
"GL_COMPRESSED_RG11_EAC": { "GL_COMPRESSED_RG11_EAC": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8G8_UNORM_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8G8_UNORM"
}, },
"GL_COMPRESSED_RGB8_ETC2": { "GL_COMPRESSED_RGB8_ETC2": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM"
}, },
"GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2": { "GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM"
}, },
"GL_COMPRESSED_RGBA8_ETC2_EAC": { "GL_COMPRESSED_RGBA8_ETC2_EAC": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM"
}, },
"GL_COMPRESSED_RGBA_S3TC_DXT1_EXT": "ANGLE_FORMAT_BC1_UNORM", "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT": "ANGLE_FORMAT_BC1_UNORM",
"GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE": "ANGLE_FORMAT_BC2_UNORM", "GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE": "ANGLE_FORMAT_BC2_UNORM",
...@@ -48,10 +48,10 @@ ...@@ -48,10 +48,10 @@
"GL_COMPRESSED_RGBA_ASTC_12x12_KHR": "ANGLE_FORMAT_NONE", "GL_COMPRESSED_RGBA_ASTC_12x12_KHR": "ANGLE_FORMAT_NONE",
"GL_COMPRESSED_RGB_S3TC_DXT1_EXT": "ANGLE_FORMAT_BC1_UNORM", "GL_COMPRESSED_RGB_S3TC_DXT1_EXT": "ANGLE_FORMAT_BC1_UNORM",
"GL_COMPRESSED_SIGNED_R11_EAC": { "GL_COMPRESSED_SIGNED_R11_EAC": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8_SNORM_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8_SNORM"
}, },
"GL_COMPRESSED_SIGNED_RG11_EAC": { "GL_COMPRESSED_SIGNED_RG11_EAC": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8G8_SNORM_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8G8_SNORM"
}, },
"GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR": "ANGLE_FORMAT_NONE", "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR": "ANGLE_FORMAT_NONE",
"GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR": "ANGLE_FORMAT_NONE", "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR": "ANGLE_FORMAT_NONE",
...@@ -68,13 +68,13 @@ ...@@ -68,13 +68,13 @@
"GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR": "ANGLE_FORMAT_NONE", "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR": "ANGLE_FORMAT_NONE",
"GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR": "ANGLE_FORMAT_NONE", "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR": "ANGLE_FORMAT_NONE",
"GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC": { "GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB"
}, },
"GL_COMPRESSED_SRGB8_ETC2": { "GL_COMPRESSED_SRGB8_ETC2": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB"
}, },
"GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2": { "GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2": {
"OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE" "OnlyFL10Plus": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB"
}, },
"GL_DEPTH24_STENCIL8": { "GL_DEPTH24_STENCIL8": {
"OnlyFL10Plus": "ANGLE_FORMAT_D24_UNORM_S8_UINT_FL10", "OnlyFL10Plus": "ANGLE_FORMAT_D24_UNORM_S8_UINT_FL10",
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
"GL_DEPTH_COMPONENT32_OES": { "GL_DEPTH_COMPONENT32_OES": {
"OnlyFL10Plus": "ANGLE_FORMAT_D24_UNORM_S8_UINT_FL10" "OnlyFL10Plus": "ANGLE_FORMAT_D24_UNORM_S8_UINT_FL10"
}, },
"GL_ETC1_RGB8_OES": "ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE", "GL_ETC1_RGB8_OES": "ANGLE_FORMAT_R8G8B8A8_UNORM",
"GL_ETC1_RGB8_LOSSY_DECODE_ANGLE": "ANGLE_FORMAT_BC1_UNORM", "GL_ETC1_RGB8_LOSSY_DECODE_ANGLE": "ANGLE_FORMAT_BC1_UNORM",
"GL_LUMINANCE": "ANGLE_FORMAT_R8G8B8A8_UNORM", "GL_LUMINANCE": "ANGLE_FORMAT_R8G8B8A8_UNORM",
"GL_LUMINANCE16F_EXT": "ANGLE_FORMAT_R16G16B16A16_FLOAT", "GL_LUMINANCE16F_EXT": "ANGLE_FORMAT_R16G16B16A16_FLOAT",
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
"GL_RGBA8I": "ANGLE_FORMAT_R8G8B8A8_SINT", "GL_RGBA8I": "ANGLE_FORMAT_R8G8B8A8_SINT",
"GL_RGBA8UI": "ANGLE_FORMAT_R8G8B8A8_UINT", "GL_RGBA8UI": "ANGLE_FORMAT_R8G8B8A8_UINT",
"GL_RGBA8_SNORM": "ANGLE_FORMAT_R8G8B8A8_SNORM", "GL_RGBA8_SNORM": "ANGLE_FORMAT_R8G8B8A8_SNORM",
"GL_SRGB8": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE", "GL_SRGB8": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB",
"GL_SRGB8_ALPHA8": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB", "GL_SRGB8_ALPHA8": "ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB",
"GL_STENCIL_INDEX8": { "GL_STENCIL_INDEX8": {
"OnlyFL10Plus": "ANGLE_FORMAT_X24_TYPELESS_G8_UINT", "OnlyFL10Plus": "ANGLE_FORMAT_X24_TYPELESS_G8_UINT",
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
...@@ -855,21 +855,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat) ...@@ -855,21 +855,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat)
ReadColor<R8G8B8A8, GLfloat>); ReadColor<R8G8B8A8, GLfloat>);
return formatInfo; return formatInfo;
} }
case ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE:
{
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE,
GL_RGBA8,
GL_RGBA8,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8B8A8_UNORM,
ANGLE_FORMAT_R8G8B8A8_UNORM,
GenerateMip<R8G8B8A8>,
ReadColor<R8G8B8A8, GLfloat>);
return formatInfo;
}
case ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB: case ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB:
{ {
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB, static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB,
...@@ -885,21 +870,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat) ...@@ -885,21 +870,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat)
ReadColor<R8G8B8A8, GLfloat>); ReadColor<R8G8B8A8, GLfloat>);
return formatInfo; return formatInfo;
} }
case ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE:
{
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE,
GL_SRGB8_ALPHA8,
GL_SRGB8_ALPHA8,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
ANGLE_FORMAT_R8G8B8A8_UNORM,
GenerateMip<R8G8B8A8>,
ReadColor<R8G8B8A8, GLfloat>);
return formatInfo;
}
case ANGLE_FORMAT_R8G8_SINT: case ANGLE_FORMAT_R8G8_SINT:
{ {
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8_SINT, static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8_SINT,
...@@ -930,21 +900,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat) ...@@ -930,21 +900,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat)
ReadColor<R8G8S, GLfloat>); ReadColor<R8G8S, GLfloat>);
return formatInfo; return formatInfo;
} }
case ANGLE_FORMAT_R8G8_SNORM_NONRENDERABLE:
{
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8_SNORM_NONRENDERABLE,
GL_RG8_SNORM,
GL_RG8_SNORM,
DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8_SNORM,
ANGLE_FORMAT_R8G8B8A8_SNORM,
GenerateMip<R8G8S>,
ReadColor<R8G8S, GLfloat>);
return formatInfo;
}
case ANGLE_FORMAT_R8G8_UINT: case ANGLE_FORMAT_R8G8_UINT:
{ {
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8_UINT, static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8_UINT,
...@@ -975,21 +930,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat) ...@@ -975,21 +930,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat)
ReadColor<R8G8, GLfloat>); ReadColor<R8G8, GLfloat>);
return formatInfo; return formatInfo;
} }
case ANGLE_FORMAT_R8G8_UNORM_NONRENDERABLE:
{
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8G8_UNORM_NONRENDERABLE,
GL_RG8,
GL_RG8,
DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8_UNORM,
ANGLE_FORMAT_R8G8B8A8_UNORM,
GenerateMip<R8G8>,
ReadColor<R8G8, GLfloat>);
return formatInfo;
}
case ANGLE_FORMAT_R8_SINT: case ANGLE_FORMAT_R8_SINT:
{ {
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8_SINT, static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8_SINT,
...@@ -1020,21 +960,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat) ...@@ -1020,21 +960,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat)
ReadColor<R8S, GLfloat>); ReadColor<R8S, GLfloat>);
return formatInfo; return formatInfo;
} }
case ANGLE_FORMAT_R8_SNORM_NONRENDERABLE:
{
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8_SNORM_NONRENDERABLE,
GL_R8_SNORM,
GL_R8_SNORM,
DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8_SNORM,
ANGLE_FORMAT_R8G8B8A8_SNORM,
GenerateMip<R8S>,
ReadColor<R8S, GLfloat>);
return formatInfo;
}
case ANGLE_FORMAT_R8_UINT: case ANGLE_FORMAT_R8_UINT:
{ {
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8_UINT, static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8_UINT,
...@@ -1065,21 +990,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat) ...@@ -1065,21 +990,6 @@ const ANGLEFormatSet &GetANGLEFormatSet(ANGLEFormat angleFormat)
ReadColor<R8, GLfloat>); ReadColor<R8, GLfloat>);
return formatInfo; return formatInfo;
} }
case ANGLE_FORMAT_R8_UNORM_NONRENDERABLE:
{
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R8_UNORM_NONRENDERABLE,
GL_R8,
GL_R8,
DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8_UNORM,
ANGLE_FORMAT_R8G8B8A8_UNORM,
GenerateMip<R8>,
ReadColor<R8, GLfloat>);
return formatInfo;
}
case ANGLE_FORMAT_R9G9B9E5_SHAREDEXP: case ANGLE_FORMAT_R9G9B9E5_SHAREDEXP:
{ {
static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R9G9B9E5_SHAREDEXP, static const ANGLEFormatSet formatInfo(ANGLE_FORMAT_R9G9B9E5_SHAREDEXP,
...@@ -1223,7 +1133,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1223,7 +1133,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8_UNORM_NONRENDERABLE, ANGLE_FORMAT_R8_UNORM,
nullptr); nullptr);
return textureFormat; return textureFormat;
} }
...@@ -1237,7 +1147,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1237,7 +1147,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8_UNORM_NONRENDERABLE, ANGLE_FORMAT_R8G8_UNORM,
nullptr); nullptr);
return textureFormat; return textureFormat;
} }
...@@ -1251,7 +1161,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1251,7 +1161,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE, ANGLE_FORMAT_R8G8B8A8_UNORM,
Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>); Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>);
return textureFormat; return textureFormat;
} }
...@@ -1265,7 +1175,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1265,7 +1175,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE, ANGLE_FORMAT_R8G8B8A8_UNORM,
Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>); Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>);
return textureFormat; return textureFormat;
} }
...@@ -1279,7 +1189,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1279,7 +1189,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE, ANGLE_FORMAT_R8G8B8A8_UNORM,
nullptr); nullptr);
return textureFormat; return textureFormat;
} }
...@@ -1419,7 +1329,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1419,7 +1329,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8_SNORM_NONRENDERABLE, ANGLE_FORMAT_R8_SNORM,
nullptr); nullptr);
return textureFormat; return textureFormat;
} }
...@@ -1433,7 +1343,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1433,7 +1343,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8_SNORM_NONRENDERABLE, ANGLE_FORMAT_R8G8_SNORM,
nullptr); nullptr);
return textureFormat; return textureFormat;
} }
...@@ -1545,7 +1455,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1545,7 +1455,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE, ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB,
nullptr); nullptr);
return textureFormat; return textureFormat;
} }
...@@ -1559,7 +1469,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1559,7 +1469,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE, ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB,
Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>); Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>);
return textureFormat; return textureFormat;
} }
...@@ -1573,7 +1483,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1573,7 +1483,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
if (OnlyFL10Plus(renderer11DeviceCaps)) if (OnlyFL10Plus(renderer11DeviceCaps))
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE, ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB,
nullptr); nullptr);
return textureFormat; return textureFormat;
} }
...@@ -1711,7 +1621,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1711,7 +1621,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
case GL_ETC1_RGB8_OES: case GL_ETC1_RGB8_OES:
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE, ANGLE_FORMAT_R8G8B8A8_UNORM,
Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>); Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>);
return textureFormat; return textureFormat;
} }
...@@ -2222,7 +2132,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -2222,7 +2132,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
case GL_SRGB8: case GL_SRGB8:
{ {
static const TextureFormat textureFormat(internalFormat, static const TextureFormat textureFormat(internalFormat,
ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE, ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB,
Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>); Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>);
return textureFormat; return textureFormat;
} }
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.h
...@@ -60,21 +60,15 @@ enum ANGLEFormat ...@@ -60,21 +60,15 @@ enum ANGLEFormat
ANGLE_FORMAT_R8G8B8A8_SNORM, ANGLE_FORMAT_R8G8B8A8_SNORM,
ANGLE_FORMAT_R8G8B8A8_UINT, ANGLE_FORMAT_R8G8B8A8_UINT,
ANGLE_FORMAT_R8G8B8A8_UNORM, ANGLE_FORMAT_R8G8B8A8_UNORM,
ANGLE_FORMAT_R8G8B8A8_UNORM_NONRENDERABLE,
ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB, ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB,
ANGLE_FORMAT_R8G8B8A8_UNORM_SRGB_NONRENDERABLE,
ANGLE_FORMAT_R8G8_SINT, ANGLE_FORMAT_R8G8_SINT,
ANGLE_FORMAT_R8G8_SNORM, ANGLE_FORMAT_R8G8_SNORM,
ANGLE_FORMAT_R8G8_SNORM_NONRENDERABLE,
ANGLE_FORMAT_R8G8_UINT, ANGLE_FORMAT_R8G8_UINT,
ANGLE_FORMAT_R8G8_UNORM, ANGLE_FORMAT_R8G8_UNORM,
ANGLE_FORMAT_R8G8_UNORM_NONRENDERABLE,
ANGLE_FORMAT_R8_SINT, ANGLE_FORMAT_R8_SINT,
ANGLE_FORMAT_R8_SNORM, ANGLE_FORMAT_R8_SNORM,
ANGLE_FORMAT_R8_SNORM_NONRENDERABLE,
ANGLE_FORMAT_R8_UINT, ANGLE_FORMAT_R8_UINT,
ANGLE_FORMAT_R8_UNORM, ANGLE_FORMAT_R8_UNORM,
ANGLE_FORMAT_R8_UNORM_NONRENDERABLE,
ANGLE_FORMAT_R9G9B9E5_SHAREDEXP, ANGLE_FORMAT_R9G9B9E5_SHAREDEXP,
ANGLE_FORMAT_X24_TYPELESS_G8_UINT ANGLE_FORMAT_X24_TYPELESS_G8_UINT
}; };
......
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