catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video_core: fix type correctness of Address() member functions in pm4_cmds.h

This commit is contained in:
Random06457 2024-08-25 23:43:33 +09:00
parent db619463dd
commit b041e255f3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video_core/amdgpu/pm4_cmds.h
View File

@ -313,7 +313,7 @@ struct PM4CmdEventWriteEop {
template <typename T>
T* Address() const {
return reinterpret_cast<T*>(address_lo | u64(address_hi) << 32);
return reinterpret_cast<T*>((uintptr_t(address_hi) << 32) | address_lo);
}
u32 DataDWord() const {
@ -527,7 +527,7 @@ struct PM4CmdEventWriteEos {
template <typename T = u32*>
T Address() const {
return reinterpret_cast<T>(address_lo | u64(address_hi) << 32);
return reinterpret_cast<T>((uintptr_t(address_hi) << 32) | address_lo);
}
u32 DataDWord() const {
@ -582,7 +582,7 @@ struct PM4DumpConstRam {
template <typename T>
T Address() const {
return reinterpret_cast<T>((u64(addr_hi) << 32u) | addr_lo);
return reinterpret_cast<T>((uintptr_t(addr_hi) << 32u) | addr_lo);
}
[[nodiscard]] u32 Offset() const {
@ -634,7 +634,7 @@ struct PM4CmdIndirectBuffer {
template <typename T>
T* Address() const {
return reinterpret_cast<T*>((u64(ibase_hi) << 32u) | ibase_lo);
return reinterpret_cast<T*>((uintptr_t(ibase_hi) << 32u) | ibase_lo);
}
};
@ -671,7 +671,7 @@ struct PM4CmdReleaseMem {
template <typename T>
T* Address() const {
return reinterpret_cast<T*>(address_lo | u64(address_hi) << 32);
return reinterpret_cast<T*>((uintptr_t(address_hi) << 32) | address_lo);
}
u32 DataDWord() const {