Remove separate ANGLE_texture_multisample_array
We can just expose OES_texture_storage_multisample_2d_array instead.
The compiler was already changed to accept
OES_texture_storage_multisample_2d_array, and now the change is made
also at the API level.
Out-of-bounds access guarantees provided by ANGLE were the only big
difference between the ANGLE spec and the OES spec, so it's simpler
to just expose the native extension. Safe out-of-bounds accesses can
be guaranteed without having them in the extension spec.
This also adds missing texStorage3DMultisample entry point to the proc
table, which will enable running dEQP tests.
BUG=angleproject:2775
TEST=angle_end2end_tests
Change-Id: Idf376ee877a3374a33de177df023f0531ec8f01d
Reviewed-on: https://chromium-review.googlesource.com/1196722
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
diff --git a/scripts/entry_point_packed_gl_enums.json b/scripts/entry_point_packed_gl_enums.json
index 343f9dd..ef932ca 100644
--- a/scripts/entry_point_packed_gl_enums.json
+++ b/scripts/entry_point_packed_gl_enums.json
@@ -367,7 +367,7 @@
"glTexStorage2DMultisample": {
"target": "TextureType"
},
- "glTexStorage3DMultisampleANGLE": {
+ "glTexStorage3DMultisampleOES": {
"target": "TextureType"
},
"glTexStorage3D": {
diff --git a/scripts/generate_entry_points.py b/scripts/generate_entry_points.py
index 7c23c04..f401bee 100755
--- a/scripts/generate_entry_points.py
+++ b/scripts/generate_entry_points.py
@@ -24,7 +24,6 @@
"GL_ANGLE_request_extension",
"GL_ANGLE_robust_client_memory",
"GL_ANGLE_multiview",
- "GL_ANGLE_texture_multisample_array",
]
gles1_extensions = [
@@ -68,6 +67,7 @@
"GL_OES_EGL_image",
"GL_OES_get_program_binary",
"GL_OES_mapbuffer",
+ "GL_OES_texture_storage_multisample_2d_array",
"GL_OES_vertex_array_object",
"GL_KHR_parallel_shader_compile",
])
diff --git a/scripts/gl_angle_ext.xml b/scripts/gl_angle_ext.xml
index 0b16d6c..c1742d9 100644
--- a/scripts/gl_angle_ext.xml
+++ b/scripts/gl_angle_ext.xml
@@ -815,16 +815,6 @@
<param><ptype>GLsizei</ptype> <name>numViews</name></param>
<param><ptype>const GLint *</ptype> <name>viewportOffsets</name></param>
</command>
- <command>
- <proto>void <name>glTexStorage3DMultisampleANGLE</name></proto>
- <param><ptype>GLenum</ptype> <name>target</name></param>
- <param><ptype>GLsizei</ptype> <name>samples</name></param>
- <param><ptype>GLint</ptype> <name>sizedinternalformat</name></param>
- <param><ptype>GLsizei</ptype> <name>width</name></param>
- <param><ptype>GLsizei</ptype> <name>height</name></param>
- <param><ptype>GLsizei</ptype> <name>depth</name></param>
- <param><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
- </command>
</commands>
<!-- SECTION: ANGLE extension interface definitions -->
<extensions>
@@ -957,10 +947,5 @@
<command name="glFramebufferTextureMultiviewLayeredANGLE"/>
</require>
</extension>
- <extension name="GL_ANGLE_texture_multisample_array" supported='gl'>
- <require>
- <command name="glTexStorage3DMultisampleANGLE"/>
- </require>
- </extension>
</extensions>
</registry>
diff --git a/scripts/run_code_generation_hashes.json b/scripts/run_code_generation_hashes.json
index d354461..ffd55d6 100644
--- a/scripts/run_code_generation_hashes.json
+++ b/scripts/run_code_generation_hashes.json
@@ -46,9 +46,9 @@
"GL copy conversion table:src/libANGLE/gen_copy_conversion_table.py":
"ac1afe23d9578bd1d2ef74f4a7aa927a",
"GL entry point:scripts/entry_point_packed_gl_enums.json":
- "7412abe534b86730a7949fe5b37db832",
+ "df2c879ccb62109a31c24d4b1df45354",
"GL entry point:scripts/generate_entry_points.py":
- "0f7d70a72b497f577c9db4fc164097d7",
+ "bfe4041311e3ae882ed218e306d7b683",
"GL entry point:scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708",
"GL format map:src/libANGLE/es3_format_type_combinations.json":
@@ -88,11 +88,11 @@
"packed enum:src/common/packed_egl_enums.json":
"0389a8a565ccee99163bd0cf3ca146d3",
"packed enum:src/common/packed_gl_enums.json":
- "522c7f55be07b2e56364766be9b1cc04",
+ "d8112f980e13ebaed3a888325563e632",
"proc table:src/libGLESv2/gen_proc_table.py":
"027bfd5a8a8dffe91f492bf199029cde",
"proc table:src/libGLESv2/proc_table_data.json":
- "340bc0beb8a8a6824ae60ac2ec2768ab",
+ "2c452ae503df669222e85961ab75fb22",
"uniform type:src/common/gen_uniform_type_table.py":
"261d239af143eeb4bd3d69cdd53ee096"
}
\ No newline at end of file