Update ANGLE to chromium/3280

Change-Id: I0802c0d7486f772d361f87a544d6c5af937f4ca1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 138 insertions, 24 deletions

diff --git a/src/3rdparty/angle/src/libANGLE/angletypes.cpp b/src/3rdparty/angle/src/libANGLE/angletypes.cpp
index fa5b157906..702d391e46 100644
--- a/src/3rdparty/angle/src/libANGLE/angletypes.cpp
+++ b/src/3rdparty/angle/src/libANGLE/angletypes.cpp
@@ -39,39 +39,143 @@ PrimitiveType GetPrimitiveType(GLenum drawMode)
     }
 }
 
+RasterizerState::RasterizerState()
+{
+    memset(this, 0, sizeof(RasterizerState));
+
+    rasterizerDiscard   = false;
+    cullFace            = false;
+    cullMode            = CullFaceMode::Back;
+    frontFace           = GL_CCW;
+    polygonOffsetFill   = false;
+    polygonOffsetFactor = 0.0f;
+    polygonOffsetUnits  = 0.0f;
+    pointDrawMode       = false;
+    multiSample         = false;
+}
+
+bool operator==(const RasterizerState &a, const RasterizerState &b)
+{
+    return memcmp(&a, &b, sizeof(RasterizerState)) == 0;
+}
+
+bool operator!=(const RasterizerState &a, const RasterizerState &b)
+{
+    return !(a == b);
+}
+
+BlendState::BlendState()
+{
+    memset(this, 0, sizeof(BlendState));
+
+    blend                 = false;
+    sourceBlendRGB        = GL_ONE;
+    sourceBlendAlpha      = GL_ONE;
+    destBlendRGB          = GL_ZERO;
+    destBlendAlpha        = GL_ZERO;
+    blendEquationRGB      = GL_FUNC_ADD;
+    blendEquationAlpha    = GL_FUNC_ADD;
+    sampleAlphaToCoverage = false;
+    dither                = true;
+}
+
+BlendState::BlendState(const BlendState &other)
+{
+    memcpy(this, &other, sizeof(BlendState));
+}
+
+bool operator==(const BlendState &a, const BlendState &b)
+{
+    return memcmp(&a, &b, sizeof(BlendState)) == 0;
+}
+
+bool operator!=(const BlendState &a, const BlendState &b)
+{
+    return !(a == b);
+}
+
+DepthStencilState::DepthStencilState()
+{
+    memset(this, 0, sizeof(DepthStencilState));
+
+    depthTest                = false;
+    depthFunc                = GL_LESS;
+    depthMask                = true;
+    stencilTest              = false;
+    stencilFunc              = GL_ALWAYS;
+    stencilMask              = static_cast<GLuint>(-1);
+    stencilWritemask         = static_cast<GLuint>(-1);
+    stencilBackFunc          = GL_ALWAYS;
+    stencilBackMask          = static_cast<GLuint>(-1);
+    stencilBackWritemask     = static_cast<GLuint>(-1);
+    stencilFail              = GL_KEEP;
+    stencilPassDepthFail     = GL_KEEP;
+    stencilPassDepthPass     = GL_KEEP;
+    stencilBackFail          = GL_KEEP;
+    stencilBackPassDepthFail = GL_KEEP;
+    stencilBackPassDepthPass = GL_KEEP;
+}
+
+DepthStencilState::DepthStencilState(const DepthStencilState &other)
+{
+    memcpy(this, &other, sizeof(DepthStencilState));
+}
+
+bool operator==(const DepthStencilState &a, const DepthStencilState &b)
+{
+    return memcmp(&a, &b, sizeof(DepthStencilState)) == 0;
+}
+
+bool operator!=(const DepthStencilState &a, const DepthStencilState &b)
+{
+    return !(a == b);
+}
+
 SamplerState::SamplerState()
-    : minFilter(GL_NEAREST_MIPMAP_LINEAR),
-      magFilter(GL_LINEAR),
-      wrapS(GL_REPEAT),
-      wrapT(GL_REPEAT),
-      wrapR(GL_REPEAT),
-      maxAnisotropy(1.0f),
-      minLod(-1000.0f),
-      maxLod(1000.0f),
-      compareMode(GL_NONE),
-      compareFunc(GL_LEQUAL)
 {
+    memset(this, 0, sizeof(SamplerState));
+
+    minFilter     = GL_NEAREST_MIPMAP_LINEAR;
+    magFilter     = GL_LINEAR;
+    wrapS         = GL_REPEAT;
+    wrapT         = GL_REPEAT;
+    wrapR         = GL_REPEAT;
+    maxAnisotropy = 1.0f;
+    minLod        = -1000.0f;
+    maxLod        = 1000.0f;
+    compareMode   = GL_NONE;
+    compareFunc   = GL_LEQUAL;
+    sRGBDecode    = GL_DECODE_EXT;
 }
 
-TextureState::TextureState()
-    : swizzleRed(GL_RED),
-      swizzleGreen(GL_GREEN),
-      swizzleBlue(GL_BLUE),
-      swizzleAlpha(GL_ALPHA),
-      samplerState(),
-      baseLevel(0),
-      maxLevel(1000),
-      immutableFormat(false),
-      immutableLevels(0)
+SamplerState::SamplerState(const SamplerState &other) = default;
+
+// static
+SamplerState SamplerState::CreateDefaultForTarget(GLenum target)
 {
+    SamplerState state;
+
+    // According to OES_EGL_image_external and ARB_texture_rectangle: For external textures, the
+    // default min filter is GL_LINEAR and the default s and t wrap modes are GL_CLAMP_TO_EDGE.
+    if (target == GL_TEXTURE_EXTERNAL_OES || target == GL_TEXTURE_RECTANGLE_ANGLE)
+    {
+        state.minFilter = GL_LINEAR;
+        state.wrapS     = GL_CLAMP_TO_EDGE;
+        state.wrapT     = GL_CLAMP_TO_EDGE;
+    }
+
+    return state;
 }
 
-bool TextureState::swizzleRequired() const
+ImageUnit::ImageUnit()
+    : texture(), level(0), layered(false), layer(0), access(GL_READ_ONLY), format(GL_R32UI)
 {
-    return swizzleRed != GL_RED || swizzleGreen != GL_GREEN ||
-           swizzleBlue != GL_BLUE || swizzleAlpha != GL_ALPHA;
 }
 
+ImageUnit::ImageUnit(const ImageUnit &other) = default;
+
+ImageUnit::~ImageUnit() = default;
+
 static void MinMax(int a, int b, int *minimum, int *maximum)
 {
     if (a < b)
@@ -133,6 +237,16 @@ bool Box::operator!=(const Box &other) const
     return !(*this == other);
 }
 
+bool operator==(const Offset &a, const Offset &b)
+{
+    return a.x == b.x && a.y == b.y && a.z == b.z;
+}
+
+bool operator!=(const Offset &a, const Offset &b)
+{
+    return !(a == b);
+}
+
 bool operator==(const Extents &lhs, const Extents &rhs)
 {
     return lhs.width == rhs.width && lhs.height == rhs.height && lhs.depth == rhs.depth;
@@ -142,4 +256,4 @@ bool operator!=(const Extents &lhs, const Extents &rhs)
 {
     return !(lhs == rhs);
 }
-}
+}  // namespace gl