mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
general: fix type inconsistencies
This commit is contained in:
parent
a7792e5ff8
commit
ba4213d956
4 changed files with 7 additions and 7 deletions
|
@ -44,11 +44,11 @@ const KAddressSpaceInfo& GetAddressSpaceInfo(size_t width, KAddressSpaceInfo::Ty
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
uintptr_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) {
|
std::size_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) {
|
||||||
return GetAddressSpaceInfo(width, type).address;
|
return GetAddressSpaceInfo(width, type).address;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) {
|
std::size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) {
|
||||||
return GetAddressSpaceInfo(width, type).size;
|
return GetAddressSpaceInfo(width, type).size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ struct KAddressSpaceInfo final {
|
||||||
Count,
|
Count,
|
||||||
};
|
};
|
||||||
|
|
||||||
static u64 GetAddressSpaceStart(std::size_t width, Type type);
|
static std::size_t GetAddressSpaceStart(std::size_t width, Type type);
|
||||||
static std::size_t GetAddressSpaceSize(std::size_t width, Type type);
|
static std::size_t GetAddressSpaceSize(std::size_t width, Type type);
|
||||||
|
|
||||||
const std::size_t bit_width{};
|
const std::size_t bit_width{};
|
||||||
|
|
|
@ -21,9 +21,9 @@ public:
|
||||||
~KDeviceAddressSpace();
|
~KDeviceAddressSpace();
|
||||||
|
|
||||||
Result Initialize(u64 address, u64 size);
|
Result Initialize(u64 address, u64 size);
|
||||||
void Finalize();
|
void Finalize() override;
|
||||||
|
|
||||||
bool IsInitialized() const {
|
bool IsInitialized() const override {
|
||||||
return m_is_initialized;
|
return m_is_initialized;
|
||||||
}
|
}
|
||||||
static void PostDestroy(uintptr_t arg) {}
|
static void PostDestroy(uintptr_t arg) {}
|
||||||
|
|
|
@ -238,7 +238,7 @@ private:
|
||||||
return indices;
|
return indices;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) {
|
void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) override {
|
||||||
switch (index_type) {
|
switch (index_type) {
|
||||||
case VK_INDEX_TYPE_UINT8_EXT:
|
case VK_INDEX_TYPE_UINT8_EXT:
|
||||||
std::memcpy(staging_data, MakeIndices<u8>(quad, first).data(), quad_size);
|
std::memcpy(staging_data, MakeIndices<u8>(quad, first).data(), quad_size);
|
||||||
|
@ -278,7 +278,7 @@ private:
|
||||||
return indices;
|
return indices;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) {
|
void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) override {
|
||||||
switch (index_type) {
|
switch (index_type) {
|
||||||
case VK_INDEX_TYPE_UINT8_EXT:
|
case VK_INDEX_TYPE_UINT8_EXT:
|
||||||
std::memcpy(staging_data, MakeIndices<u8>(quad, first).data(), quad_size);
|
std::memcpy(staging_data, MakeIndices<u8>(quad, first).data(), quad_size);
|
||||||
|
|
Loading…
Reference in a new issue