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, 73 deletions

diff --git a/gfx/angle/src/libANGLE/renderer/null/QueryNULL.cpp b/gfx/angle/src/libANGLE/renderer/null/QueryNULL.cpp
deleted file mode 100644
index 6276a0ff1..000000000
--- a/gfx/angle/src/libANGLE/renderer/null/QueryNULL.cpp
+++ /dev/null
@@ -1,73 +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.
-//
-// QueryNULL.cpp:
-//    Implements the class methods for QueryNULL.
-//
-
-#include "libANGLE/renderer/null/QueryNULL.h"
-
-#include "common/debug.h"
-
-namespace rx
-{
-
-QueryNULL::QueryNULL(GLenum type) : QueryImpl(type)
-{
-}
-
-QueryNULL::~QueryNULL()
-{
-}
-
-gl::Error QueryNULL::begin()
-{
-    UNIMPLEMENTED();
-    return gl::Error(GL_INVALID_OPERATION);
-}
-
-gl::Error QueryNULL::end()
-{
-    UNIMPLEMENTED();
-    return gl::Error(GL_INVALID_OPERATION);
-}
-
-gl::Error QueryNULL::queryCounter()
-{
-    UNIMPLEMENTED();
-    return gl::Error(GL_INVALID_OPERATION);
-}
-
-gl::Error QueryNULL::getResult(GLint *params)
-{
-    UNIMPLEMENTED();
-    return gl::Error(GL_INVALID_OPERATION);
-}
-
-gl::Error QueryNULL::getResult(GLuint *params)
-{
-    UNIMPLEMENTED();
-    return gl::Error(GL_INVALID_OPERATION);
-}
-
-gl::Error QueryNULL::getResult(GLint64 *params)
-{
-    UNIMPLEMENTED();
-    return gl::Error(GL_INVALID_OPERATION);
-}
-
-gl::Error QueryNULL::getResult(GLuint64 *params)
-{
-    UNIMPLEMENTED();
-    return gl::Error(GL_INVALID_OPERATION);
-}
-
-gl::Error QueryNULL::isResultAvailable(bool *available)
-{
-    UNIMPLEMENTED();
-    return gl::Error(GL_INVALID_OPERATION);
-}
-
-}  // namespace rx