commit 1f05d459e26cf0c4a76b82fe62776c90477d9931
author Brian Salomon <bsalomon@google.com> Fri Feb 08 12:33:08 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 08 21:26:51 2019 +0000
tree 97b484cdde9870d217c39a955f82534c2fa9ce2e
parent 3e8392e42c783bf9d20d8128186e4c6fb54d570b

Add GrContext::resetGLTextureBindings().

This function binds texture ID 0 to any texture unit/target combo that
Skia has modified.

Bug: chromium:926017
Change-Id: I3ac8f8050c863232886102886e60d3b91a5380c9
Reviewed-on: https://skia-review.googlesource.com/c/190663
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/gl/GrGLGpu.h

diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
index b559dee..f14bd23 100644
--- a/src/gpu/gl/GrGLGpu.h
+++ b/src/gpu/gl/GrGLGpu.h
@@ -182,6 +182,8 @@
     // GrGpu overrides
     void onResetContext(uint32_t resetBits) override;
 
+    void onResetTextureBindings() override;
+
     void xferBarrier(GrRenderTarget*, GrXferBarrierType) override;
 
     sk_sp<GrTexture> onCreateTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
@@ -603,12 +605,17 @@
         TextureUnitBindings& operator=(const TextureUnitBindings&) = delete;
 
         GrGpuResource::UniqueID boundID(GrGLenum target) const;
+        bool hasBeenModified(GrGLenum target) const;
         void setBoundID(GrGLenum target, GrGpuResource::UniqueID);
-        void invalidate(GrGLenum target);
-        void invalidateAllTargets();
+        void invalidateForScratchUse(GrGLenum target);
+        void invalidateAllTargets(bool markUnmodified);
 
     private:
-        GrGpuResource::UniqueID fBoundResourceIDs[3];
+        struct TargetBinding {
+            GrGpuResource::UniqueID fBoundResourceID;
+            bool fHasBeenModified = false;
+        };
+        TargetBinding fTargetBindings[3];
     };
     SkAutoTArray<TextureUnitBindings> fHWTextureUnitBindings;