Skip to content

Commit

Permalink
Remove LegacyNoInterfaceObject annotations and expose prototypes.
Browse files Browse the repository at this point in the history
Rename prototypes like EXT_frag_depth => WebGLExtensionExtFragDepth.
Remove `noobject:true` xml annotations.
Leave some proposals and all rejected extensions untouched.
Closes KhronosGroup#3366.
  • Loading branch information
kdashg committed Feb 12, 2022
1 parent 4429f45 commit 1e73e5d
Show file tree
Hide file tree
Showing 49 changed files with 357 additions and 212 deletions.
9 changes: 6 additions & 3 deletions extensions/ANGLE_instanced_arrays/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
</p>
</overview>
<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface ANGLE_instanced_arrays {
[Exposed=(Window,Worker)]
interface WebGLExtensionAngleInstancedArrays {
const GLenum VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE = 0x88FE;
undefined drawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei primcount);
undefined drawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, GLintptr offset, GLsizei primcount);
undefined vertexAttribDivisorANGLE(GLuint index, GLuint divisor);
undefined vertexAttribDivisorANGLE(GLuint index, GLuint divisor);
};
</idl>
<issues>
Expand Down Expand Up @@ -74,5 +74,8 @@ interface ANGLE_instanced_arrays {
<revision date="2015/09/23">
<change>Clarified interaction with OES_vertex_array_object.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</ratified>
7 changes: 5 additions & 2 deletions extensions/EXT_blend_minmax/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_blend_minmax {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtBlendMinmax {
const GLenum MIN_EXT = 0x8007;
const GLenum MAX_EXT = 0x8008;
};
Expand Down Expand Up @@ -66,5 +66,8 @@ interface EXT_blend_minmax {
<revision date="2015/05/29">
<change>Ratified by Khronos Board of Promoters.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</ratified>
7 changes: 5 additions & 2 deletions extensions/EXT_clip_cull_distance/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_clip_cull_distance {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtClipCullDistance {
const GLenum MAX_CLIP_DISTANCES_EXT = 0x0D32;
const GLenum MAX_CULL_DISTANCES_EXT = 0x82F9;
const GLenum MAX_COMBINED_CLIP_AND_CULL_DISTANCES_EXT = 0x82FA;
Expand Down Expand Up @@ -86,5 +86,8 @@
<revision date="2020/07/01">
<change>Added addendum that allows for the number of cull planes to be 0.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</draft>
10 changes: 7 additions & 3 deletions extensions/EXT_color_buffer_float/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_color_buffer_float {
}; // interface EXT_color_buffer_float
[Exposed=(Window,Worker)]
interface WebGLExtensionExtColorBufferFloat {
};
</idl>

<history>
Expand Down Expand Up @@ -110,5 +110,9 @@ interface EXT_color_buffer_float {
<revision date="2017/04/19">
<change>Allowed these float formats for CopyTexImage2D.</change>
</revision>

<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
10 changes: 7 additions & 3 deletions extensions/EXT_color_buffer_half_float/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_color_buffer_half_float {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtColorBufferHalfFloat {
const GLenum RGBA16F_EXT = 0x881A;
const GLenum RGB16F_EXT = 0x881B;
const GLenum FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT = 0x8211;
const GLenum UNSIGNED_NORMALIZED_EXT = 0x8C17;
}; // interface EXT_color_buffer_half_float
};
</idl>

<additions>
Expand Down Expand Up @@ -168,5 +168,9 @@ interface EXT_color_buffer_half_float {
only to 16-bit floating point targets, and therefore can not support
EXT_color_buffer_float.</change>
</revision>

<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
9 changes: 6 additions & 3 deletions extensions/EXT_disjoint_timer_query/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
<idl xml:space="preserve">
typedef unsigned long long GLuint64EXT;

[Exposed=(Window,Worker), LegacyNoInterfaceObject]
[Exposed=(Window,Worker)]
interface WebGLTimerQueryEXT : WebGLObject {
};

[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_disjoint_timer_query {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtDisjointTimerQuery {
const GLenum QUERY_COUNTER_BITS_EXT = 0x8864;
const GLenum CURRENT_QUERY_EXT = 0x8865;
const GLenum QUERY_RESULT_EXT = 0x8866;
Expand Down Expand Up @@ -402,5 +402,8 @@ interface EXT_disjoint_timer_query {
<revision date="2021/04/01">
<change>Clean up query objects via deleteQueryEXT. Modernize examples' JavaScript code.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
11 changes: 7 additions & 4 deletions extensions/EXT_disjoint_timer_query_webgl2/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_disjoint_timer_query_webgl2 {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtDisjointTimerQueryWebgl2 {
const GLenum QUERY_COUNTER_BITS_EXT = 0x8864;
const GLenum TIME_ELAPSED_EXT = 0x88BF;
const GLenum TIMESTAMP_EXT = 0x8E28;
Expand Down Expand Up @@ -87,7 +87,7 @@ interface EXT_disjoint_timer_query_webgl2 {
<tr><td>TIMESTAMP_EXT</td><td>CURRENT_QUERY</td><td>null</td></tr>
<tr><td>TIME_ELAPSED_EXT</td><td>QUERY_COUNTER_BITS_EXT</td><td>GLint</td></tr>
<tr><td>TIMESTAMP_EXT</td><td>QUERY_COUNTER_BITS_EXT</td><td>GLint</td></tr>
</table>
</table>
</function>
</newtok>

Expand All @@ -102,7 +102,7 @@ interface EXT_disjoint_timer_query_webgl2 {
<tr><th>pname</th><th>returned type</th></tr>
<tr><td>TIMESTAMP_EXT</td><td>GLuint64</td></tr>
<tr><td>GPU_DISJOINT_EXT</td><td>boolean</td></tr>
</table>
</table>
</function>
</newtok>

Expand Down Expand Up @@ -281,5 +281,8 @@ interface EXT_disjoint_timer_query_webgl2 {
<revision date="2021/04/01">
<change>Clean up query objects via deleteQuery. Modernize examples' JavaScript code.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
10 changes: 7 additions & 3 deletions extensions/EXT_float_blend/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_float_blend {
}; // interface EXT_float_blend
[Exposed=(Window,Worker)]
interface WebGLExtensionExtFloatBlend {
};
</idl>

<history>
Expand All @@ -78,5 +78,9 @@ interface EXT_float_blend {
<revision date="2019/08/27">
<change>Clarified that this extension applies to both WebGL 1.0 and 2.0 contexts.</change>
</revision>

<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
9 changes: 6 additions & 3 deletions extensions/EXT_frag_depth/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
</glsl>
</features>
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_frag_depth {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtFragDepth {
};
</idl>

Expand Down Expand Up @@ -66,5 +66,8 @@
<revision date="2015/05/29">
<change>Ratified by Khronos Board of Promoters.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</ratified>
7 changes: 5 additions & 2 deletions extensions/EXT_sRGB/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_sRGB {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtSrgb {
const GLenum SRGB_EXT = 0x8C40;
const GLenum SRGB_ALPHA_EXT = 0x8C42;
const GLenum SRGB8_ALPHA8_EXT = 0x8C43;
Expand Down Expand Up @@ -83,5 +83,8 @@
<revision date="2014/07/15">
<change>Added NoInterfaceObject extended attribute.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
9 changes: 6 additions & 3 deletions extensions/EXT_shader_texture_lod/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@
</glsl>
</features>
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_shader_texture_lod {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtShaderTextureLod {
};
</idl>

Expand Down Expand Up @@ -120,5 +120,8 @@
<revision date="2015/05/29">
<change>Ratified by Khronos Board of Promoters.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</ratified>
7 changes: 5 additions & 2 deletions extensions/EXT_texture_compression_bptc/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
</features>
</overview>
<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_texture_compression_bptc {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtTextureCompressionBptc {
const GLenum COMPRESSED_RGBA_BPTC_UNORM_EXT = 0x8E8C;
const GLenum COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT = 0x8E8D;
const GLenum COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT = 0x8E8E;
Expand Down Expand Up @@ -142,5 +142,8 @@ interface EXT_texture_compression_bptc {
<revision date="2020/07/07">
<change>Clarified WebGL-specific dimensions restriction.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
7 changes: 5 additions & 2 deletions extensions/EXT_texture_compression_rgtc/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
</features>
</overview>
<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_texture_compression_rgtc {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtTextureCompressionRgtc {
const GLenum COMPRESSED_RED_RGTC1_EXT = 0x8DBB;
const GLenum COMPRESSED_SIGNED_RED_RGTC1_EXT = 0x8DBC;
const GLenum COMPRESSED_RED_GREEN_RGTC2_EXT = 0x8DBD;
Expand Down Expand Up @@ -152,5 +152,8 @@ interface EXT_texture_compression_rgtc {
<revision date="2020/07/07">
<change>Clarified WebGL-specific dimensions restriction.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
7 changes: 5 additions & 2 deletions extensions/EXT_texture_filter_anisotropic/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</features>
</overview>
<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_texture_filter_anisotropic {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtTextureFilterAnisotropic {
const GLenum TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE;
const GLenum MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF;
};
Expand All @@ -48,5 +48,8 @@ interface EXT_texture_filter_anisotropic {
<revision date="2014/07/15">
<change>Added NoInterfaceObject extended attribute.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</ratified>
7 changes: 5 additions & 2 deletions extensions/EXT_texture_norm16/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface EXT_texture_norm16 {
[Exposed=(Window,Worker)]
interface WebGLExtensionExtTextureNorm16 {
const GLenum R16_EXT = 0x822A;
const GLenum RG16_EXT = 0x822C;
const GLenum RGB16_EXT = 0x8054;
Expand Down Expand Up @@ -76,5 +76,8 @@ interface EXT_texture_norm16 {
<revision date="2020/12/03">
<change>Constrain the scope to only support ArrayBufferView.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
7 changes: 5 additions & 2 deletions extensions/KHR_parallel_shader_compile/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface KHR_parallel_shader_compile {
[Exposed=(Window,Worker)]
interface WebGLExtensionKhrParallelShaderCompile {
const GLenum COMPLETION_STATUS_KHR = 0x91B1;
};
</idl>
Expand Down Expand Up @@ -150,5 +150,8 @@
<revision date="2020/11/24">
<change>Specify lost context behavior.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
7 changes: 5 additions & 2 deletions extensions/OES_draw_buffers_indexed/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
</overview>

<idl xml:space="preserve">
[Exposed=(Window,Worker), LegacyNoInterfaceObject]
interface OES_draw_buffers_indexed {
[Exposed=(Window,Worker)]
interface WebGLExtensionOesDrawBuffersIndexed {
undefined enableiOES(GLenum target, GLuint index);

undefined disableiOES(GLenum target, GLuint index);
Expand Down Expand Up @@ -228,5 +228,8 @@ interface OES_draw_buffers_indexed {
<revision date="2021/11/04">
<change>Moved to community approved.</change>
</revision>
<revision date="2022/02/11">
<change>Rename and expose prototype.</change>
</revision>
</history>
</extension>
Loading

0 comments on commit 1e73e5d

Please sign in to comment.