Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 0 insertions, 89 deletions

diff --git a/gfx/angle/src/libANGLE/renderer/null/TextureNULL.h b/gfx/angle/src/libANGLE/renderer/null/TextureNULL.h
deleted file mode 100644
index 10c2d3503..000000000
--- a/gfx/angle/src/libANGLE/renderer/null/TextureNULL.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright 2016 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.
-//
-// TextureNULL.h:
-//    Defines the class interface for TextureNULL, implementing TextureImpl.
-//
-
-#ifndef LIBANGLE_RENDERER_NULL_TEXTURENULL_H_
-#define LIBANGLE_RENDERER_NULL_TEXTURENULL_H_
-
-#include "libANGLE/renderer/TextureImpl.h"
-
-namespace rx
-{
-
-class TextureNULL : public TextureImpl
-{
-  public:
-    TextureNULL(const gl::TextureState &state);
-    ~TextureNULL() override;
-
-    gl::Error setImage(GLenum target,
-                       size_t level,
-                       GLenum internalFormat,
-                       const gl::Extents &size,
-                       GLenum format,
-                       GLenum type,
-                       const gl::PixelUnpackState &unpack,
-                       const uint8_t *pixels) override;
-    gl::Error setSubImage(GLenum target,
-                          size_t level,
-                          const gl::Box &area,
-                          GLenum format,
-                          GLenum type,
-                          const gl::PixelUnpackState &unpack,
-                          const uint8_t *pixels) override;
-
-    gl::Error setCompressedImage(GLenum target,
-                                 size_t level,
-                                 GLenum internalFormat,
-                                 const gl::Extents &size,
-                                 const gl::PixelUnpackState &unpack,
-                                 size_t imageSize,
-                                 const uint8_t *pixels) override;
-    gl::Error setCompressedSubImage(GLenum target,
-                                    size_t level,
-                                    const gl::Box &area,
-                                    GLenum format,
-                                    const gl::PixelUnpackState &unpack,
-                                    size_t imageSize,
-                                    const uint8_t *pixels) override;
-
-    gl::Error copyImage(GLenum target,
-                        size_t level,
-                        const gl::Rectangle &sourceArea,
-                        GLenum internalFormat,
-                        const gl::Framebuffer *source) override;
-    gl::Error copySubImage(GLenum target,
-                           size_t level,
-                           const gl::Offset &destOffset,
-                           const gl::Rectangle &sourceArea,
-                           const gl::Framebuffer *source) override;
-
-    gl::Error setStorage(GLenum target,
-                         size_t levels,
-                         GLenum internalFormat,
-                         const gl::Extents &size) override;
-
-    gl::Error setEGLImageTarget(GLenum target, egl::Image *image) override;
-
-    gl::Error setImageExternal(GLenum target,
-                               egl::Stream *stream,
-                               const egl::Stream::GLTextureDescription &desc) override;
-
-    gl::Error generateMipmap() override;
-
-    void setBaseLevel(GLuint baseLevel) override;
-
-    void bindTexImage(egl::Surface *surface) override;
-    void releaseTexImage() override;
-
-    void syncState(const gl::Texture::DirtyBits &dirtyBits) override;
-};
-
-}  // namespace rx
-
-#endif  // LIBANGLE_RENDERER_NULL_TEXTURENULL_H_