Skip to content

Commit d01ae53

Browse files
kenrussellCommit Bot
authored andcommitted
(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 <[email protected]> Reviewed-by: Jamie Madill <[email protected]> Commit-Queue: Kenneth Russell <[email protected]>
1 parent d5735c1 commit d01ae53

File tree

4 files changed

+77
-4
lines changed

4 files changed

+77
-4
lines changed
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
Name
2+
3+
ANGLE_compressed_texture_etc
4+
5+
Name Strings
6+
7+
GL_ANGLE_compressed_texture_etc
8+
9+
Version
10+
11+
Last Modifed Date: October 5, 2019
12+
13+
Dependencies
14+
15+
OpenGL ES 2.0 is required.
16+
17+
Overview
18+
19+
This extension exposes the OpenGL ES 3.0 core compressed texture
20+
formats in OpenGL ES 2.0.
21+
22+
New Procedures and Functions
23+
24+
None
25+
26+
New Tokens
27+
28+
Accepted by the <internalformat> parameter of CompressedTexImage2D and the
29+
<format> parameter of CompressedTexSubImage2D:
30+
31+
COMPRESSED_R11_EAC 0x9270
32+
COMPRESSED_SIGNED_R11_EAC 0x9271
33+
COMPRESSED_RG11_EAC 0x9272
34+
COMPRESSED_SIGNED_RG11_EAC 0x9273
35+
COMPRESSED_RGB8_ETC2 0x9274
36+
COMPRESSED_SRGB8_ETC2 0x9275
37+
COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
38+
COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
39+
COMPRESSED_RGBA8_ETC2_EAC 0x9278
40+
COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
41+
42+
Querying COMPRESSED_TEXTURE_FORMATS will include these new formats.
43+
44+
New Procedures and Functions
45+
46+
None.
47+
48+
Errors
49+
50+
The error INVALID_VALUE is generated if the <internalformat> parameter of
51+
CompressedTexImage2D or the <format> parameter of CompressedTexSubImage2D is
52+
COMPRESSED_R11_EAC, COMPRESSED_SIGNED_R11_EAC, COMPRESSED_RGB8_ETC2,
53+
COMPRESSED_SRGB8_ETC2, COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 or
54+
COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, and imageSize is not
55+
56+
floor((width + 3) / 4) * floor((height + 3) / 4) * 8
57+
58+
The error INVALID_VALUE is generated if the <internalformat> parameter of
59+
CompressedTexImage2D or the <format> paremeter of CompressedTexSubImage2D is
60+
COMPRESSED_RG11_EAC, COMPRESSED_SIGNED_RG11_EAC, COMPRESSED_RGBA8_ETC2_EAC,
61+
or COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, and imageSize is not
62+
63+
floor((width + 3) / 4) * floor((height + 3) / 4) * 16
64+
65+
66+
New State
67+
68+
None.
69+
70+
Revision History
71+
72+
9/19/2016 First revision
73+
10/5/2019 Rename to ANGLE_compressed_texture_etc

src/libANGLE/Caps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ const ExtensionInfoMap &GetExtensionInfoMap()
777777
map["OES_compressed_EAC_R11_signed_texture"] = enableableExtension(&Extensions::compressedEACR11SignedTexture);
778778
map["OES_compressed_EAC_RG11_unsigned_texture"] = enableableExtension(&Extensions::compressedEACRG11UnsignedTexture);
779779
map["OES_compressed_EAC_RG11_signed_texture"] = enableableExtension(&Extensions::compressedEACRG11SignedTexture);
780-
map["GL_CHROMIUM_compressed_texture_etc"] = enableableExtension(&Extensions::compressedTextureETC);
780+
map["GL_ANGLE_compressed_texture_etc"] = enableableExtension(&Extensions::compressedTextureETC);
781781
map["GL_EXT_sRGB"] = enableableExtension(&Extensions::sRGB);
782782
map["GL_ANGLE_depth_texture"] = esOnlyExtension(&Extensions::depthTextureANGLE);
783783
map["GL_OES_depth_texture"] = esOnlyExtension(&Extensions::depthTextureOES);

src/libANGLE/Caps.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void InitMinimumTextureCapsMap(const Version &clientVersion,
8383
const Extensions &extensions,
8484
TextureCapsMap *capsMap);
8585

86-
// Returns true if all the formats required to support GL_CHROMIUM_compressed_texture_etc are
86+
// Returns true if all the formats required to support GL_ANGLE_compressed_texture_etc are
8787
// present. Does not determine if they are natively supported without decompression.
8888
bool DetermineCompressedTextureETCSupport(const TextureCapsMap &textureCaps);
8989

@@ -234,7 +234,7 @@ struct Extensions
234234
// OES_compressed_EAC_RG11_signed_texture
235235
bool compressedEACRG11SignedTexture = false;
236236

237-
// GL_CHROMIUM_compressed_texture_etc
237+
// ANGLE_compressed_texture_etc
238238
// ONLY exposed if ETC texture formats are natively supported without decompression
239239
// Backends should enable this extension explicitly. It is not enabled with
240240
// setTextureExtensionSupport, use DetermineCompressedTextureETCSupport to check if all of the

src/libANGLE/renderer/gl/renderergl_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ void GenerateCaps(const FunctionsGL *functions,
14041404
functions->hasGLESExtension("GL_OES_draw_elements_base_vertex") ||
14051405
functions->hasGLESExtension("GL_EXT_draw_elements_base_vertex");
14061406

1407-
// GL_CHROMIUM_compressed_texture_etc
1407+
// ANGLE_compressed_texture_etc
14081408
// Expose this extension only when we support the formats or we're running on top of a native
14091409
// ES driver.
14101410
extensions->compressedTextureETC = functions->standard == STANDARD_GL_ES &&

0 commit comments

Comments
 (0)