Changeset 261751 in webkit

Timestamp:

May 15, 2020 11:33:21 AM (4 years ago)

Author:

dino@apple.com

Message:

REGRESSION (r259589): Google Maps background layer fades out and back in
​https://bugs.webkit.org/show_bug.cgi?id=210992

Patch by James Darpinian <James Darpinian> on 2020-05-14
Reviewed by Dean Jackson.

ANGLE rendering feedback loop detection was incorrect if a texture attached
to a framebuffer was also bound to an active texture unit, and then that texture
unit became inactive because a sampler uniform was set.

• src/libANGLE/Context.cpp:

(gl::Context::onSamplerUniformChange):

• src/libANGLE/State.cpp:

(gl::State::setTextureIndexInactive):

• src/libANGLE/State.h:

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/libANGLE/Context.cpp (modified) (1 diff)
• src/libANGLE/State.cpp (modified) (1 diff)
• src/libANGLE/State.h (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2020-05-14  James Darpinian  <jdarpinian@chromium.org>
+
+        REGRESSION (r259589): Google Maps background layer fades out and back in
+        https://bugs.webkit.org/show_bug.cgi?id=210992
+
+        Reviewed by Dean Jackson.
+
+        ANGLE rendering feedback loop detection was incorrect if a texture attached
+        to a framebuffer was also bound to an active texture unit, and then that texture
+        unit became inactive because a sampler uniform was set.
+
+        * src/libANGLE/Context.cpp:
+        (gl::Context::onSamplerUniformChange):
+        * src/libANGLE/State.cpp:
+        (gl::State::setTextureIndexInactive):
+        * src/libANGLE/State.h:
+
 2020-05-14  Kenneth Russell  <kbr@chromium.org>
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp

@@ -6467 +6467 @@
     mState.onActiveTextureChange(this, textureUnitIndex);
     mStateCache.onActiveTextureChange(this);
+    if (!mState.getProgram()->getExecutable().getActiveSamplersMask()[textureUnitIndex]) {
+        mState.setTextureIndexInactive(textureUnitIndex);
+    }
 }
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/State.cpp

@@ -598 +598 @@
 }
 
+void State::setTextureIndexInactive(size_t textureIndex) {
+    mActiveTexturesCache.reset(textureIndex);
+}
+
 ANGLE_INLINE void State::updateActiveTextureState(const Context *context,
                                                   size_t textureIndex,

trunk/Source/ThirdParty/ANGLE/src/libANGLE/State.h

@@ -778 +778 @@
                                   const Sampler *sampler,
                                   Texture *texture);
+    void setTextureIndexInactive(size_t textureIndex);
     Texture *getTextureForActiveSampler(TextureType type, size_t index);