From a4b2dfb51b0f7cbfce2e8f93ff92c8d7035eafb9 Mon Sep 17 00:00:00 2001
From: Alexander Cooper <[email protected]>
Date: Mon, 22 Jun 2026 12:26:14 -0700
Subject: [PATCH] Reset polygon mode when blitting to XR cubemap texture

Ensures that if the WEBGL_polygon_mode extension is used by the
page it doesn't interfere with copies done to the XR cubemap
swap chains.

To avoid code duplication, this CL also introduces a helper class
`ScopedXRWebGLStateRestorer` that handles saving, setting up, and
restoring the WebGL state required for WebXR copy-draw operations.
This helper is used by both XRWebGLTextureArraySwapChain and
XRWebGLCubemapSwapChain.

Fixed: 524822998
Change-Id: I85f78dc68234f67426ee8e9b3f5ca07056a72aff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7958958
Commit-Queue: Brian Sheedy <[email protected]>
Reviewed-by: Brian Sheedy <[email protected]>
Auto-Submit: Alexander Cooper <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1650490}
---

diff --git a/third_party/blink/renderer/modules/xr/xr_webgl_cubemap_swap_chain.cc b/third_party/blink/renderer/modules/xr/xr_webgl_cubemap_swap_chain.cc
index 29e1f52..cb57f7b0 100644
--- a/third_party/blink/renderer/modules/xr/xr_webgl_cubemap_swap_chain.cc
+++ b/third_party/blink/renderer/modules/xr/xr_webgl_cubemap_swap_chain.cc
@@ -237,97 +237,44 @@
   CHECK_EQ(wrapped_swapchain_->descriptor().width, descriptor().width);
   CHECK_EQ(wrapped_swapchain_->descriptor().height, descriptor().height);
 
-  // Read the old state.
-  std::array<GLint, 4> curr_viewport = {0, 0, 0, 0};
-  gl->GetIntegerv(GL_VIEWPORT, curr_viewport.data());
+  {
+    ScopedXRWebGLStateRestorer restorer(context(), GL_TEXTURE_CUBE_MAP);
 
-  const bool depth_test_enabled = gl->IsEnabled(GL_DEPTH_TEST);
-  const bool stencil_test_enabled = gl->IsEnabled(GL_STENCIL_TEST);
-  const bool culling_enabled = gl->IsEnabled(GL_CULL_FACE);
-  const bool blend_enabled = gl->IsEnabled(GL_BLEND);
-  const bool dither_enabled = gl->IsEnabled(GL_DITHER);
+    gl->ActiveTexture(GL_TEXTURE0);
+    gl->BindTexture(GL_TEXTURE_CUBE_MAP,
+                    source_texture->Object());  // Source cubemap
 
-  gl->Disable(GL_DEPTH_TEST);
-  gl->Disable(GL_STENCIL_TEST);
-  gl->Disable(GL_CULL_FACE);
-  gl->Disable(GL_BLEND);
-  gl->Disable(GL_DITHER);
-  gl->Disable(GL_SCISSOR_TEST);
+    gl->UseProgram(copy_program_);
+    gl->Uniform1i(texture_uniform_, 0);
 
-  if (webgl2()) {
-    gl->Disable(GL_RASTERIZER_DISCARD);
+    gl->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer_);
+    gl->BindBuffer(GL_ARRAY_BUFFER, vertex_buffer_);
+
+    // Set up position attribute.
+    gl->VertexAttribPointer(position_handle_, 2, GL_FLOAT, false, 0, nullptr);
+    gl->EnableVertexAttribArray(position_handle_);
+
+    gl->BindFramebuffer(GL_FRAMEBUFFER, GetFramebuffer()->Object());
+    gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                             GL_TEXTURE_2D, target_texture->Object(), 0);
+
+    const GLenum draw_buffers[] = {GL_COLOR_ATTACHMENT0};
+    gl->DrawBuffersEXT(1, draw_buffers);
+
+    // 6 faces are placed as 3 tiles per row.
+    for (int i = 0; i < 6; ++i) {
+      gl->Viewport(descriptor().width * (i % 3), descriptor().height * (i / 3),
+                   descriptor().width, descriptor().height);
+      gl->Uniform1f(face_index_uniform_, i);
+      gl->DrawElements(GL_TRIANGLES, std::size(kQuadIndices), GL_UNSIGNED_SHORT,
+                       nullptr);
+    }
+
+    gl->DisableVertexAttribArray(position_handle_);
+    gl->BindBuffer(GL_ARRAY_BUFFER, 0);
+    gl->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
   }
 
-  gl->ColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-  gl->DepthMask(GL_FALSE);
-
-  gl->ActiveTexture(GL_TEXTURE0);
-  gl->BindTexture(GL_TEXTURE_CUBE_MAP,
-                  source_texture->Object());  // Source cubemap
-
-  gl->UseProgram(copy_program_);
-  gl->Uniform1i(texture_uniform_, 0);
-
-  gl->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer_);
-  gl->BindBuffer(GL_ARRAY_BUFFER, vertex_buffer_);
-
-  // Set up position attribute.
-  gl->VertexAttribPointer(position_handle_, 2, GL_FLOAT, false, 0, nullptr);
-  gl->EnableVertexAttribArray(position_handle_);
-
-  gl->BindFramebuffer(GL_FRAMEBUFFER, GetFramebuffer()->Object());
-  gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
-                           target_texture->Object(), 0);
-
-  const GLenum draw_buffers[] = {GL_COLOR_ATTACHMENT0};
-  gl->DrawBuffersEXT(1, draw_buffers);
-
-  // 6 faces are placed as 3 tiles per row.
-  for (int i = 0; i < 6; ++i) {
-    gl->Viewport(descriptor().width * (i % 3), descriptor().height * (i / 3),
-                 descriptor().width, descriptor().height);
-    gl->Uniform1f(face_index_uniform_, i);
-    gl->DrawElements(GL_TRIANGLES, std::size(kQuadIndices), GL_UNSIGNED_SHORT,
-                     nullptr);
-  }
-
-  gl->DisableVertexAttribArray(position_handle_);
-  gl->BindBuffer(GL_ARRAY_BUFFER, 0);
-  gl->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-
-  // Restore the saved old state
-  gl->Viewport(curr_viewport[0], curr_viewport[1], curr_viewport[2],
-               curr_viewport[3]);
-  if (depth_test_enabled) {
-    gl->Enable(GL_DEPTH_TEST);
-  }
-  if (stencil_test_enabled) {
-    gl->Enable(GL_STENCIL_TEST);
-  }
-  if (culling_enabled) {
-    gl->Enable(GL_CULL_FACE);
-  }
-  if (blend_enabled) {
-    gl->Enable(GL_BLEND);
-  }
-  if (dither_enabled) {
-    gl->Enable(GL_DITHER);
-  }
-
-  // WebGLRenderingContextBase inherits from DrawingBuffer::Client, but makes
-  // all the methods private. Downcasting allows us to access them.
-  DrawingBuffer::Client* client =
-      static_cast<DrawingBuffer::Client*>(context());
-  client->DrawingBufferClientRestoreTextureCubeMapBinding();
-  client->DrawingBufferClientRestoreScissorTest();
-  client->DrawingBufferClientRestoreRasterizerDiscard();
-  client->DrawingBufferClientRestoreMaskAndClearValues();
-  client->DrawingBufferClientRestoreFramebufferBinding();
-
-  context()->RestoreVertexArrayObjectBinding();
-  context()->RestoreProgram();
-  context()->RestoreActiveTexture();
-
   wrapped_swapchain_->OnFrameEnd();
 
   // Intentionally not calling ResetCurrentTexture() here to keep the previously
diff --git a/third_party/blink/renderer/modules/xr/xr_webgl_swap_chain.cc b/third_party/blink/renderer/modules/xr/xr_webgl_swap_chain.cc
index cddccfa..9cc8af2 100644
--- a/third_party/blink/renderer/modules/xr/xr_webgl_swap_chain.cc
+++ b/third_party/blink/renderer/modules/xr/xr_webgl_swap_chain.cc
@@ -4,6 +4,7 @@
 
 #include "third_party/blink/renderer/modules/xr/xr_webgl_swap_chain.h"
 
+#include "base/notreached.h"
 #include "third_party/blink/renderer/modules/webgl/webgl_framebuffer.h"
 #include "third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h"
 #include "third_party/blink/renderer/modules/webgl/webgl_texture.h"
@@ -12,6 +13,101 @@
 
 namespace blink {
 
+ScopedXRWebGLStateRestorer::ScopedXRWebGLStateRestorer(
+    WebGLRenderingContextBase* context,
+    GLenum source_texture_target)
+    : context_(context),
+      gl_(context->ContextGL()),
+      source_texture_target_(source_texture_target) {
+  if (!gl_) {
+    return;
+  }
+
+  gl_->GetIntegerv(GL_VIEWPORT, viewport_.data());
+
+  depth_test_enabled_ = gl_->IsEnabled(GL_DEPTH_TEST);
+  stencil_test_enabled_ = gl_->IsEnabled(GL_STENCIL_TEST);
+  culling_enabled_ = gl_->IsEnabled(GL_CULL_FACE);
+  blend_enabled_ = gl_->IsEnabled(GL_BLEND);
+  dither_enabled_ = gl_->IsEnabled(GL_DITHER);
+
+  polygon_mode_extension_enabled_ =
+      context_->ExtensionsUtil()->IsExtensionEnabled("WEBGL_polygon_mode");
+  if (polygon_mode_extension_enabled_) {
+    GLint value = 0;
+    gl_->GetIntegerv(GL_POLYGON_MODE_ANGLE, &value);
+    polygon_mode_ = static_cast<GLenum>(value);
+    gl_->PolygonModeANGLE(GL_FRONT_AND_BACK, GL_FILL_ANGLE);