зеркало из https://github.com/AvaloniaUI/angle.git
Move the anglebase folder up a level
This code originates from Chromium's base/ directory so it doesn't have to be under a third-party folder. Bug: b/260093525 Change-Id: I0bf6950095c685f36c5c237093980a64cf6e74f0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4068339 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Nicolas Capens <nicolascapens@google.com>
This commit is contained in:
Родитель
e4054a3fae
Коммит
c991eb2296
2
BUILD.gn
2
BUILD.gn
|
@ -402,7 +402,7 @@ config("angle_asserts_config") {
|
|||
|
||||
config("angle_common_config") {
|
||||
include_dirs = [
|
||||
"src/common/third_party/base",
|
||||
"src/common/base",
|
||||
"src/common/third_party/xxhash",
|
||||
]
|
||||
if (is_android) {
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
// A macro to disallow the copy constructor and operator= functions.
|
||||
// This should be used in the private: declarations for a class.
|
||||
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
|
||||
TypeName(const TypeName &) = delete; \
|
||||
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
|
||||
TypeName(const TypeName &) = delete; \
|
||||
void operator=(const TypeName &) = delete
|
||||
|
||||
#endif // ANGLEBASE_MACROS_H_
|
|
@ -55,7 +55,7 @@ class NoDestructor
|
|||
// Not constexpr; just write static constexpr T x = ...; if the value should
|
||||
// be a constexpr.
|
||||
template <typename... Args>
|
||||
explicit NoDestructor(Args &&... args)
|
||||
explicit NoDestructor(Args &&...args)
|
||||
{
|
||||
new (storage_) T(std::forward<Args>(args)...);
|
||||
}
|
||||
|
@ -65,7 +65,7 @@ class NoDestructor
|
|||
explicit NoDestructor(const T &x) { new (storage_) T(x); }
|
||||
explicit NoDestructor(T &&x) { new (storage_) T(std::move(x)); }
|
||||
|
||||
NoDestructor(const NoDestructor &) = delete;
|
||||
NoDestructor(const NoDestructor &) = delete;
|
||||
NoDestructor &operator=(const NoDestructor &) = delete;
|
||||
|
||||
~NoDestructor() = default;
|
|
@ -291,10 +291,10 @@ template <
|
|||
typename Src,
|
||||
template <typename>
|
||||
class Bounds,
|
||||
IntegerRepresentation DstSign = std::is_signed<Dst>::value ? INTEGER_REPRESENTATION_SIGNED
|
||||
: INTEGER_REPRESENTATION_UNSIGNED,
|
||||
IntegerRepresentation SrcSign = std::is_signed<Src>::value ? INTEGER_REPRESENTATION_SIGNED
|
||||
: INTEGER_REPRESENTATION_UNSIGNED,
|
||||
IntegerRepresentation DstSign = std::is_signed<Dst>::value ? INTEGER_REPRESENTATION_SIGNED
|
||||
: INTEGER_REPRESENTATION_UNSIGNED,
|
||||
IntegerRepresentation SrcSign = std::is_signed<Src>::value ? INTEGER_REPRESENTATION_SIGNED
|
||||
: INTEGER_REPRESENTATION_UNSIGNED,
|
||||
NumericRangeRepresentation DstRange = StaticDstRangeRelationToSrcRange<Dst, Src>::value>
|
||||
struct DstRangeRelationToSrcRangeImpl;
|
||||
|
|
@ -59,7 +59,8 @@ class SecureHashAlgorithm
|
|||
|
||||
uint32_t H[5];
|
||||
|
||||
union {
|
||||
union
|
||||
{
|
||||
uint32_t W[80];
|
||||
uint8_t M[64];
|
||||
};
|
||||
|
@ -137,7 +138,7 @@ void SecureHashAlgorithm::Final()
|
|||
Process();
|
||||
|
||||
for (int t = 0; t < 5; ++t)
|
||||
H[t] = ByteSwap(H[t]);
|
||||
H[t] = ByteSwap(H[t]);
|
||||
}
|
||||
|
||||
void SecureHashAlgorithm::Update(const void *data, size_t nbytes)
|
||||
|
@ -188,11 +189,11 @@ void SecureHashAlgorithm::Process()
|
|||
//
|
||||
// W and M are in a union, so no need to memcpy.
|
||||
// memcpy(W, M, sizeof(M));
|
||||
for (t = 0; t < 16; ++t)
|
||||
for (t = 0; t < 16; ++t)
|
||||
W[t] = ByteSwap(W[t]);
|
||||
|
||||
// b.
|
||||
for (t = 16; t < 80; ++t)
|
||||
for (t = 16; t < 80; ++t)
|
||||
W[t] = S(1, W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16]);
|
||||
|
||||
// c.
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "libANGLE/renderer/ContextImpl.h"
|
||||
|
||||
#include "common/third_party/base/anglebase/no_destructor.h"
|
||||
#include "common/base/anglebase/no_destructor.h"
|
||||
#include "libANGLE/Context.h"
|
||||
|
||||
namespace rx
|
||||
|
|
|
@ -33,6 +33,27 @@ libangle_common_sources = [
|
|||
"src/common/angleutils.h",
|
||||
"src/common/apple_platform_utils.h",
|
||||
"src/common/backtrace_utils.h",
|
||||
"src/common/base/anglebase/base_export.h",
|
||||
"src/common/base/anglebase/containers/mru_cache.h",
|
||||
"src/common/base/anglebase/logging.h",
|
||||
"src/common/base/anglebase/macros.h",
|
||||
"src/common/base/anglebase/no_destructor.h",
|
||||
"src/common/base/anglebase/numerics/checked_math.h",
|
||||
"src/common/base/anglebase/numerics/checked_math_impl.h",
|
||||
"src/common/base/anglebase/numerics/clamped_math.h",
|
||||
"src/common/base/anglebase/numerics/clamped_math_impl.h",
|
||||
"src/common/base/anglebase/numerics/math_constants.h",
|
||||
"src/common/base/anglebase/numerics/ranges.h",
|
||||
"src/common/base/anglebase/numerics/safe_conversions.h",
|
||||
"src/common/base/anglebase/numerics/safe_conversions_arm_impl.h",
|
||||
"src/common/base/anglebase/numerics/safe_conversions_impl.h",
|
||||
"src/common/base/anglebase/numerics/safe_math.h",
|
||||
"src/common/base/anglebase/numerics/safe_math_arm_impl.h",
|
||||
"src/common/base/anglebase/numerics/safe_math_clang_gcc_impl.h",
|
||||
"src/common/base/anglebase/numerics/safe_math_shared_impl.h",
|
||||
"src/common/base/anglebase/sha1.cc",
|
||||
"src/common/base/anglebase/sha1.h",
|
||||
"src/common/base/anglebase/sys_byteorder.h",
|
||||
"src/common/bitset_utils.h",
|
||||
"src/common/debug.cpp",
|
||||
"src/common/debug.h",
|
||||
|
@ -50,27 +71,6 @@ libangle_common_sources = [
|
|||
"src/common/string_utils.h",
|
||||
"src/common/system_utils.cpp",
|
||||
"src/common/system_utils.h",
|
||||
"src/common/third_party/base/anglebase/base_export.h",
|
||||
"src/common/third_party/base/anglebase/containers/mru_cache.h",
|
||||
"src/common/third_party/base/anglebase/logging.h",
|
||||
"src/common/third_party/base/anglebase/macros.h",
|
||||
"src/common/third_party/base/anglebase/no_destructor.h",
|
||||
"src/common/third_party/base/anglebase/numerics/checked_math.h",
|
||||
"src/common/third_party/base/anglebase/numerics/checked_math_impl.h",
|
||||
"src/common/third_party/base/anglebase/numerics/clamped_math.h",
|
||||
"src/common/third_party/base/anglebase/numerics/clamped_math_impl.h",
|
||||
"src/common/third_party/base/anglebase/numerics/math_constants.h",
|
||||
"src/common/third_party/base/anglebase/numerics/ranges.h",
|
||||
"src/common/third_party/base/anglebase/numerics/safe_conversions.h",
|
||||
"src/common/third_party/base/anglebase/numerics/safe_conversions_arm_impl.h",
|
||||
"src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h",
|
||||
"src/common/third_party/base/anglebase/numerics/safe_math.h",
|
||||
"src/common/third_party/base/anglebase/numerics/safe_math_arm_impl.h",
|
||||
"src/common/third_party/base/anglebase/numerics/safe_math_clang_gcc_impl.h",
|
||||
"src/common/third_party/base/anglebase/numerics/safe_math_shared_impl.h",
|
||||
"src/common/third_party/base/anglebase/sha1.cc",
|
||||
"src/common/third_party/base/anglebase/sha1.h",
|
||||
"src/common/third_party/base/anglebase/sys_byteorder.h",
|
||||
"src/common/tls.cpp",
|
||||
"src/common/tls.h",
|
||||
"src/common/uniform_type_info_autogen.cpp",
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
#include "angle_deqp_libtester.h"
|
||||
#include "common/Optional.h"
|
||||
#include "common/angleutils.h"
|
||||
#include "common/base/anglebase/no_destructor.h"
|
||||
#include "common/debug.h"
|
||||
#include "common/platform.h"
|
||||
#include "common/string_utils.h"
|
||||
#include "common/system_utils.h"
|
||||
#include "common/third_party/base/anglebase/no_destructor.h"
|
||||
#include "platform/PlatformMethods.h"
|
||||
#include "tests/test_utils/runner/TestSuite.h"
|
||||
#include "util/OSWindow.h"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "perf_test.h"
|
||||
|
||||
#include "common/third_party/base/anglebase/no_destructor.h"
|
||||
#include "common/base/anglebase/no_destructor.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
|
|
@ -15,10 +15,10 @@
|
|||
#include <map>
|
||||
|
||||
#include "angle_gl.h"
|
||||
#include "common/base/anglebase/no_destructor.h"
|
||||
#include "common/debug.h"
|
||||
#include "common/platform.h"
|
||||
#include "common/system_utils.h"
|
||||
#include "common/third_party/base/anglebase/no_destructor.h"
|
||||
#include "gpu_info_util/SystemInfo.h"
|
||||
#include "test_utils/angle_test_configs.h"
|
||||
#include "util/EGLWindow.h"
|
||||
|
|
Загрузка…
Ссылка в новой задаче