Skip to content

common: Fix GPUMemAddr and Block #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MonsterDruide1 merged 4 commits into from
May 18, 2025
Merged

common: Fix GPUMemAddr and Block #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93ebb06
common: Fix `GPUMemAddr` and `Block`
MonsterDruide1 May 6, 2025
3a042b2
Add destructor to match `GPUMemBlockT`
MonsterDruide1 May 7, 2025
47f7940
Fix clang-format
MonsterDruide1 May 16, 2025
baa802a
Add `override` to `~GPUMemBlockT`
MonsterDruide1 May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions include/common/aglGPUMemAddr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ class Heap;
namespace agl {
class GPUMemAddrBase {
public:
GPUMemAddrBase() {}
GPUMemAddrBase(const GPUMemAddrBase& other, int alignmentOffset)
: mMemoryPool(other.mMemoryPool), mAlignmentAddr(other.mAlignmentAddr + alignmentOffset),
mMemoryBlock(other.mMemoryBlock) {}
GPUMemAddrBase(const GPUMemBlockBase& memBlock, u64 offset);

u32 verify_() const;
Expand All @@ -21,10 +25,12 @@ class GPUMemAddrBase {
void flushCPUCache(u64);
void invalidateCPUCache(u64);

bool isValid() const { return mMemoryPool != nullptr; }

private:
detail::MemoryPool* mMemoryPool;
int mAlignmentAddr;
GPUMemBlockBase* mMemoryBlock;
detail::MemoryPool* mMemoryPool = nullptr;
int mAlignmentAddr = 0;
GPUMemBlockBase* mMemoryBlock = nullptr;
};

template <typename T>
Expand Down
7 changes: 5 additions & 2 deletions include/common/aglGPUMemBlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class MemoryPoolHeap;

class GPUMemBlockBase {
public:
explicit GPUMemBlockBase(sead::Heap* p_heap);
GPUMemBlockBase();
virtual ~GPUMemBlockBase();

void clear();
Expand Down Expand Up @@ -50,7 +50,10 @@ static_assert(sizeof(GPUMemBlockBase) == 0x38);

// TODO
template <typename T>
class GPUMemBlockT : public GPUMemBlockBase {};
class GPUMemBlockT : public GPUMemBlockBase {
public:
~GPUMemBlockT() override { ; }
};

// TODO
template <typename T>
Expand Down