Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 0 insertions, 72 deletions

diff --git a/src/3rdparty/angle/src/libANGLE/Data.h b/src/3rdparty/angle/src/libANGLE/Data.h
deleted file mode 100644
index f7230d74bc..0000000000
--- a/src/3rdparty/angle/src/libANGLE/Data.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-// Data.h: Container class for all GL relevant state, caps and objects
-
-#ifndef LIBANGLE_DATA_H_
-#define LIBANGLE_DATA_H_
-
-#include "common/angleutils.h"
-#include "libANGLE/State.h"
-
-namespace gl
-{
-
-struct Data final : public angle::NonCopyable
-{
-  public:
-    Data(uintptr_t context,
-         GLint clientVersion,
-         const State &state,
-         const Caps &caps,
-         const TextureCapsMap &textureCaps,
-         const Extensions &extensions,
-         const ResourceManager *resourceManager,
-         const Limitations &limitations);
-    ~Data();
-
-    uintptr_t context;
-    GLint clientVersion;
-    const State *state;
-    const Caps *caps;
-    const TextureCapsMap *textureCaps;
-    const Extensions *extensions;
-    const ResourceManager *resourceManager;
-    const Limitations *limitations;
-};
-
-class ValidationContext : angle::NonCopyable
-{
-  public:
-    ValidationContext(GLint clientVersion,
-                      const State &state,
-                      const Caps &caps,
-                      const TextureCapsMap &textureCaps,
-                      const Extensions &extensions,
-                      const ResourceManager *resourceManager,
-                      const Limitations &limitations,
-                      bool skipValidation);
-    virtual ~ValidationContext() {}
-
-    virtual void recordError(const Error &error) = 0;
-
-    const Data &getData() const { return mData; }
-    int getClientVersion() const { return mData.clientVersion; }
-    const State &getState() const { return *mData.state; }
-    const Caps &getCaps() const { return *mData.caps; }
-    const TextureCapsMap &getTextureCaps() const { return *mData.textureCaps; }
-    const Extensions &getExtensions() const { return *mData.extensions; }
-    const Limitations &getLimitations() const { return *mData.limitations; }
-    bool skipValidation() const { return mSkipValidation; }
-
-  protected:
-    Data mData;
-    bool mSkipValidation;
-};
-
-}
-
-#endif // LIBANGLE_DATA_H_