Autogenerated changes for GL_EXT_multisampled_render_to_texture2

Bug: angleproject:4836 Change-Id: I86143c6b21ecdbc666ce316b6e4a4b402257f01c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2332957 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
skia-flutter-autoroll · Aug 1, 2020 · 41442cc · 41442cc
1 parent d04a559
commit 41442cc
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 8 deletions.
diff --git a/include/GLSLANG/ShaderLang.h b/include/GLSLANG/ShaderLang.h
@@ -26,7 +26,7 @@
 
 // Version number for shader translation API.
 // It is incremented every time the API changes.
-#define ANGLE_SH_VERSION 232
+#define ANGLE_SH_VERSION 233
 
 enum ShShaderSpec
 {
@@ -391,6 +391,7 @@ struct ShBuiltInResources
     int OVR_multiview;
     int OVR_multiview2;
     int EXT_multisampled_render_to_texture;
+    int EXT_multisampled_render_to_texture2;
     int EXT_YUV_target;
     int EXT_geometry_shader;
     int EXT_gpu_shader5;

diff --git a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
@@ -10,7 +10,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "5d9874e9e53bde1f644808dbab945578",
+    "a31e4ceb03a70104b76a33da6ba204a0",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libEGL/egl_loader_autogen.cpp":

diff --git a/scripts/code_generation_hashes/GL_EGL_entry_points.json b/scripts/code_generation_hashes/GL_EGL_entry_points.json
@@ -12,7 +12,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "5d9874e9e53bde1f644808dbab945578",
+    "a31e4ceb03a70104b76a33da6ba204a0",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libANGLE/Context_gl_1_0_autogen.h":
@@ -64,7 +64,7 @@
   "src/libANGLE/Context_gles_3_2_autogen.h":
     "e26f7ee7b59a89a4f5337171816b8336",
   "src/libANGLE/Context_gles_ext_autogen.h":
-    "63a0e0bf6a83ed75c8c355494a8ad2ec",
+    "666aa3122ce32061bef5bc8b58dda8a6",
   "src/libANGLE/capture_gles_1_0_autogen.cpp":
     "96fc0f501e2e696ab911dad8b400dfb2",
   "src/libANGLE/capture_gles_1_0_autogen.h":

diff --git a/scripts/code_generation_hashes/GLenum_value_to_string_map.json b/scripts/code_generation_hashes/GLenum_value_to_string_map.json
@@ -6,7 +6,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "5d9874e9e53bde1f644808dbab945578",
+    "a31e4ceb03a70104b76a33da6ba204a0",
   "src/libANGLE/gl_enum_utils_autogen.cpp":
     "48627c0865d15bf4014327de5858d3c5",
   "src/libANGLE/gl_enum_utils_autogen.h":

diff --git a/scripts/code_generation_hashes/proc_table.json b/scripts/code_generation_hashes/proc_table.json
@@ -10,7 +10,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "5d9874e9e53bde1f644808dbab945578",
+    "a31e4ceb03a70104b76a33da6ba204a0",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libGL/proc_table_wgl_autogen.cpp":

diff --git a/scripts/registry_xml.py b/scripts/registry_xml.py
@@ -75,6 +75,7 @@
     "GL_EXT_memory_object",
     "GL_EXT_memory_object_fd",
     "GL_EXT_multisampled_render_to_texture",
+    "GL_EXT_multisampled_render_to_texture2",
     "GL_EXT_occlusion_query_boolean",
     "GL_EXT_read_format_bgra",
     "GL_EXT_robustness",

diff --git a/src/libANGLE/Caps.cpp b/src/libANGLE/Caps.cpp
@@ -936,6 +936,7 @@ const ExtensionInfoMap &GetExtensionInfoMap()
         map["GL_ANGLE_framebuffer_blit"] = enableableExtension(&Extensions::framebufferBlit);
         map["GL_ANGLE_framebuffer_multisample"] = enableableExtension(&Extensions::framebufferMultisample);
         map["GL_EXT_multisampled_render_to_texture"] = enableableExtension(&Extensions::multisampledRenderToTexture);
+        map["GL_EXT_multisampled_render_to_texture2"] = enableableExtension(&Extensions::multisampledRenderToTexture2);
         map["GL_ANGLE_instanced_arrays"] = enableableExtension(&Extensions::instancedArraysANGLE);
         map["GL_EXT_instanced_arrays"] = enableableExtension(&Extensions::instancedArraysEXT);
         map["GL_ANGLE_pack_reverse_row_order"] = enableableExtension(&Extensions::packReverseRowOrder);

diff --git a/src/libANGLE/Caps.h b/src/libANGLE/Caps.h
@@ -351,6 +351,9 @@ struct Extensions
     // GL_EXT_multisampled_render_to_texture
     bool multisampledRenderToTexture = false;
 
+    // GL_EXT_multisampled_render_to_texture2
+    bool multisampledRenderToTexture2 = false;
+
     // GL_ANGLE_instanced_arrays
     bool instancedArraysANGLE = false;
     // GL_EXT_instanced_arrays

diff --git a/src/libANGLE/Compiler.cpp b/src/libANGLE/Compiler.cpp
@@ -117,8 +117,9 @@ Compiler::Compiler(rx::GLImplFactory *implFactory, const State &state)
     mResources.OVR_multiview2 = extensions.multiview2;
     mResources.MaxViewsOVR    = extensions.maxViews;
 
-    // EXT_multisampled_render_to_texture
-    mResources.EXT_multisampled_render_to_texture = extensions.multisampledRenderToTexture;
+    // EXT_multisampled_render_to_texture and EXT_multisampled_render_to_texture2
+    mResources.EXT_multisampled_render_to_texture  = extensions.multisampledRenderToTexture;
+    mResources.EXT_multisampled_render_to_texture2 = extensions.multisampledRenderToTexture2;
 
     // WEBGL_video_texture
     mResources.WEBGL_video_texture = extensions.webglVideoTexture;

diff --git a/src/libANGLE/Context_gles_ext_autogen.h b/src/libANGLE/Context_gles_ext_autogen.h
@@ -335,6 +335,7 @@
     void framebufferTexture2DMultisample(GLenum target, GLenum attachment,                         \
                                          TextureTarget textargetPacked, TextureID texturePacked,   \
                                          GLint level, GLsizei samples);                            \
+    /* GL_EXT_multisampled_render_to_texture2 */                                                   \
     /* GL_EXT_occlusion_query_boolean */                                                           \
     /* GL_EXT_read_format_bgra */                                                                  \
     /* GL_EXT_robustness */                                                                        \