Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 2 insertions, 40 deletions

diff --git a/gfx/angle/src/libANGLE/Texture.h b/gfx/angle/src/libANGLE/Texture.h
index 583a69a7b..36cef52cd 100755
--- a/gfx/angle/src/libANGLE/Texture.h
+++ b/gfx/angle/src/libANGLE/Texture.h
@@ -217,9 +217,6 @@ class Texture final : public egl::ImageSibling,
     void setCompareFunc(GLenum compareFunc);
     GLenum getCompareFunc() const;
 
-    void setSRGBDecode(GLenum sRGBDecode);
-    GLenum getSRGBDecode() const;
-
     const SamplerState &getSamplerState() const;
 
     void setBaseLevel(GLuint baseLevel);
@@ -298,7 +295,6 @@ class Texture final : public egl::ImageSibling,
                          bool unpackPremultiplyAlpha,
                          bool unpackUnmultiplyAlpha,
                          const Texture *source);
-    Error copyCompressedTexture(const Texture *source);
 
     Error setStorage(GLenum target, GLsizei levels, GLenum internalFormat, const Extents &size);
 
@@ -309,7 +305,8 @@ class Texture final : public egl::ImageSibling,
     egl::Surface *getBoundSurface() const;
     egl::Stream *getBoundStream() const;
 
-    rx::TextureImpl *getImplementation() const { return mTexture; }
+    rx::TextureImpl *getImplementation() { return mTexture; }
+    const rx::TextureImpl *getImplementation() const { return mTexture; }
 
     // FramebufferAttachmentObject implementation
     Extents getAttachmentSize(const FramebufferAttachment::Target &target) const override;
@@ -320,40 +317,6 @@ class Texture final : public egl::ImageSibling,
     void onDetach() override;
     GLuint getId() const override;
 
-    enum DirtyBitType
-    {
-        // Sampler state
-        DIRTY_BIT_MIN_FILTER,
-        DIRTY_BIT_MAG_FILTER,
-        DIRTY_BIT_WRAP_S,
-        DIRTY_BIT_WRAP_T,
-        DIRTY_BIT_WRAP_R,
-        DIRTY_BIT_MAX_ANISOTROPY,
-        DIRTY_BIT_MIN_LOD,
-        DIRTY_BIT_MAX_LOD,
-        DIRTY_BIT_COMPARE_MODE,
-        DIRTY_BIT_COMPARE_FUNC,
-        DIRTY_BIT_SRGB_DECODE,
-
-        // Texture state
-        DIRTY_BIT_SWIZZLE_RED,
-        DIRTY_BIT_SWIZZLE_GREEN,
-        DIRTY_BIT_SWIZZLE_BLUE,
-        DIRTY_BIT_SWIZZLE_ALPHA,
-        DIRTY_BIT_BASE_LEVEL,
-        DIRTY_BIT_MAX_LEVEL,
-
-        // Misc
-        DIRTY_BIT_LABEL,
-        DIRTY_BIT_USAGE,
-
-        DIRTY_BIT_COUNT,
-    };
-    using DirtyBits = std::bitset<DIRTY_BIT_COUNT>;
-
-    void syncImplState();
-    bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
-
   private:
     rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
 
@@ -370,7 +333,6 @@ class Texture final : public egl::ImageSibling,
     void releaseImageFromStream();
 
     TextureState mState;
-    DirtyBits mDirtyBits;
     rx::TextureImpl *mTexture;
 
     std::string mLabel;