franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5160 from lioncash/buffer-header 

buffer_block: Remove unnecessary includes
This commit is contained in:
Rodrigo Locatti 2020-12-07 04:57:40 -03:00 committed by GitHub
parent 9ae6224f12 5d2f18fbcd
commit 3ef35207c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/video_core/buffer_cache/buffer_block.h
View File

@ -4,34 +4,29 @@
#pragma once #pragma once
#include <unordered_set>
#include <utility>
#include "common/alignment.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "video_core/gpu.h"
namespace VideoCommon { namespace VideoCommon {
class BufferBlock { class BufferBlock {
public: public:
bool Overlaps(VAddr start, VAddr end) const { [[nodiscard]] bool Overlaps(VAddr start, VAddr end) const {
return (cpu_addr < end) && (cpu_addr_end > start); return (cpu_addr < end) && (cpu_addr_end > start);
} }
bool IsInside(VAddr other_start, VAddr other_end) const { [[nodiscard]] bool IsInside(VAddr other_start, VAddr other_end) const {
return cpu_addr <= other_start && other_end <= cpu_addr_end; return cpu_addr <= other_start && other_end <= cpu_addr_end;
} }
std::size_t Offset(VAddr in_addr) const { [[nodiscard]] std::size_t Offset(VAddr in_addr) const {
return static_cast<std::size_t>(in_addr - cpu_addr); return static_cast<std::size_t>(in_addr - cpu_addr);
} }
VAddr CpuAddr() const { [[nodiscard]] VAddr CpuAddr() const {
return cpu_addr; return cpu_addr;
} }
VAddr CpuAddrEnd() const { [[nodiscard]] VAddr CpuAddrEnd() const {
return cpu_addr_end; return cpu_addr_end;
} }
@ -40,11 +35,11 @@ public:
cpu_addr_end = new_addr + size; cpu_addr_end = new_addr + size;
} }
std::size_t Size() const { [[nodiscard]] std::size_t Size() const {
return size; return size;
} }
u64 Epoch() const { [[nodiscard]] u64 Epoch() const {
return epoch; return epoch;
} }