(ANGLE) Rename CHROMIUM_compressed_texture_etc to use ANGLE_ prefix.

This is the ANGLE side of a two-sided patch including Chromium to
rename this synthetic OpenGL extension to use an ANGLE_ prefix.

Bug: chromium:1011653
Change-Id: Ice4b526a34157ebbd8c283aacc9437fae2e35d6e
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1843506
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
This commit is contained in:
Kenneth Russell 2019-10-05 23:30:29 -07:00 коммит произвёл Commit Bot
Родитель d5735c1814
Коммит d01ae535b3
4 изменённых файлов: 77 добавлений и 4 удалений

Просмотреть файл

@ -0,0 +1,73 @@
Name
ANGLE_compressed_texture_etc
Name Strings
GL_ANGLE_compressed_texture_etc
Version
Last Modifed Date: October 5, 2019
Dependencies
OpenGL ES 2.0 is required.
Overview
This extension exposes the OpenGL ES 3.0 core compressed texture
formats in OpenGL ES 2.0.
New Procedures and Functions
None
New Tokens
Accepted by the <internalformat> parameter of CompressedTexImage2D and the
<format> parameter of CompressedTexSubImage2D:
COMPRESSED_R11_EAC 0x9270
COMPRESSED_SIGNED_R11_EAC 0x9271
COMPRESSED_RG11_EAC 0x9272
COMPRESSED_SIGNED_RG11_EAC 0x9273
COMPRESSED_RGB8_ETC2 0x9274
COMPRESSED_SRGB8_ETC2 0x9275
COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
COMPRESSED_RGBA8_ETC2_EAC 0x9278
COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
Querying COMPRESSED_TEXTURE_FORMATS will include these new formats.
New Procedures and Functions
None.
Errors
The error INVALID_VALUE is generated if the <internalformat> parameter of
CompressedTexImage2D or the <format> parameter of CompressedTexSubImage2D is
COMPRESSED_R11_EAC, COMPRESSED_SIGNED_R11_EAC, COMPRESSED_RGB8_ETC2,
COMPRESSED_SRGB8_ETC2, COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 or
COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, and imageSize is not
floor((width + 3) / 4) * floor((height + 3) / 4) * 8
The error INVALID_VALUE is generated if the <internalformat> parameter of
CompressedTexImage2D or the <format> paremeter of CompressedTexSubImage2D is
COMPRESSED_RG11_EAC, COMPRESSED_SIGNED_RG11_EAC, COMPRESSED_RGBA8_ETC2_EAC,
or COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, and imageSize is not
floor((width + 3) / 4) * floor((height + 3) / 4) * 16
New State
None.
Revision History
9/19/2016 First revision
10/5/2019 Rename to ANGLE_compressed_texture_etc

Просмотреть файл

@ -777,7 +777,7 @@ const ExtensionInfoMap &GetExtensionInfoMap()
map["OES_compressed_EAC_R11_signed_texture"] = enableableExtension(&Extensions::compressedEACR11SignedTexture);
map["OES_compressed_EAC_RG11_unsigned_texture"] = enableableExtension(&Extensions::compressedEACRG11UnsignedTexture);
map["OES_compressed_EAC_RG11_signed_texture"] = enableableExtension(&Extensions::compressedEACRG11SignedTexture);
map["GL_CHROMIUM_compressed_texture_etc"] = enableableExtension(&Extensions::compressedTextureETC);
map["GL_ANGLE_compressed_texture_etc"] = enableableExtension(&Extensions::compressedTextureETC);
map["GL_EXT_sRGB"] = enableableExtension(&Extensions::sRGB);
map["GL_ANGLE_depth_texture"] = esOnlyExtension(&Extensions::depthTextureANGLE);
map["GL_OES_depth_texture"] = esOnlyExtension(&Extensions::depthTextureOES);

Просмотреть файл

@ -83,7 +83,7 @@ void InitMinimumTextureCapsMap(const Version &clientVersion,
const Extensions &extensions,
TextureCapsMap *capsMap);
// Returns true if all the formats required to support GL_CHROMIUM_compressed_texture_etc are
// Returns true if all the formats required to support GL_ANGLE_compressed_texture_etc are
// present. Does not determine if they are natively supported without decompression.
bool DetermineCompressedTextureETCSupport(const TextureCapsMap &textureCaps);
@ -234,7 +234,7 @@ struct Extensions
// OES_compressed_EAC_RG11_signed_texture
bool compressedEACRG11SignedTexture = false;
// GL_CHROMIUM_compressed_texture_etc
// ANGLE_compressed_texture_etc
// ONLY exposed if ETC texture formats are natively supported without decompression
// Backends should enable this extension explicitly. It is not enabled with
// setTextureExtensionSupport, use DetermineCompressedTextureETCSupport to check if all of the

Просмотреть файл

@ -1404,7 +1404,7 @@ void GenerateCaps(const FunctionsGL *functions,
functions->hasGLESExtension("GL_OES_draw_elements_base_vertex") ||
functions->hasGLESExtension("GL_EXT_draw_elements_base_vertex");
// GL_CHROMIUM_compressed_texture_etc
// ANGLE_compressed_texture_etc
// Expose this extension only when we support the formats or we're running on top of a native
// ES driver.
extensions->compressedTextureETC = functions->standard == STANDARD_GL_ES &&