From 4d9488033f849132446ffb7840f1309fa38be8fd Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 19 Mar 2022 22:47:46 -0700
Subject: hle: nvflinger: Merge Rect with Common::Rectangle.

---
 src/core/hle/service/nvflinger/ui/rect.h | 75 --------------------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 src/core/hle/service/nvflinger/ui/rect.h

(limited to 'src/core/hle/service/nvflinger/ui')

diff --git a/src/core/hle/service/nvflinger/ui/rect.h b/src/core/hle/service/nvflinger/ui/rect.h
deleted file mode 100644
index c7b5f1815..000000000
--- a/src/core/hle/service/nvflinger/ui/rect.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Copyright 2021 yuzu Emulator Project
-// Copyright 2006 The Android Open Source Project
-// Parts of this implementation were base on:
-// https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/include/ui/Rect.h
-
-#pragma once
-
-#include <cstdint>
-#include <utility>
-
-#include "common/common_types.h"
-
-namespace Service::android {
-
-class Rect final {
-public:
-    constexpr Rect() = default;
-
-    constexpr Rect(s32 width_, s32 height_) : right{width_}, bottom{height_} {}
-
-    constexpr s32 Left() const {
-        return left;
-    }
-
-    constexpr s32 Top() const {
-        return top;
-    }
-
-    constexpr s32 Right() const {
-        return right;
-    }
-
-    constexpr s32 Bottom() const {
-        return bottom;
-    }
-
-    constexpr bool IsEmpty() const {
-        return (GetWidth() <= 0) || (GetHeight() <= 0);
-    }
-
-    constexpr s32 GetWidth() const {
-        return right - left;
-    }
-
-    constexpr s32 GetHeight() const {
-        return bottom - top;
-    }
-
-    constexpr bool operator==(const Rect& rhs) const {
-        return (left == rhs.left) && (top == rhs.top) && (right == rhs.right) &&
-               (bottom == rhs.bottom);
-    }
-
-    constexpr bool operator!=(const Rect& rhs) const {
-        return !operator==(rhs);
-    }
-
-    constexpr bool Intersect(const Rect& with, Rect* result) const {
-        result->left = std::max(left, with.left);
-        result->top = std::max(top, with.top);
-        result->right = std::min(right, with.right);
-        result->bottom = std::min(bottom, with.bottom);
-        return !result->IsEmpty();
-    }
-
-private:
-    s32 left{};
-    s32 top{};
-    s32 right{};
-    s32 bottom{};
-};
-static_assert(sizeof(Rect) == 16, "Rect has wrong size");
-
-} // namespace Service::android
-- 
cgit v1.2.3