Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove unnecessary struct FramebufferInfo

Browse Source
This commit is contained in:
Henrik Rydgård 2023-12-02 13:56:18 +01:00
parent a981ea2ea3
commit 6d977b4a12
6 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
GPU/Common/FramebufferManagerCommon.cpp
View File

@ -3187,20 +3187,11 @@ void FramebufferManagerCommon::RebindFramebuffer(const char *tag) {
}
}
std::vector<FramebufferInfo> FramebufferManagerCommon::GetFramebufferList() const {
std::vector<FramebufferInfo> list;
std::vector<const VirtualFramebuffer *> FramebufferManagerCommon::GetFramebufferList() const {
std::vector<const VirtualFramebuffer *> list;
for (auto vfb : vfbs_) {
FramebufferInfo info;
info.fb_address = vfb->fb_address;
info.z_address = vfb->z_address;
info.format = vfb->fb_format;
info.width = vfb->width;
info.height = vfb->height;
info.fbo = vfb->fbo;
list.push_back(info);
list.push_back(vfb);
}
return list;
}

2
GPU/Common/FramebufferManagerCommon.h
View File

@ -327,7 +327,7 @@ public:
void SetDepthFrameBuffer(bool isClearingDepth);
void RebindFramebuffer(const char *tag);
std::vector<FramebufferInfo> GetFramebufferList() const;
std::vector<const VirtualFramebuffer *> GetFramebufferList() const;
void CopyDisplayToOutput(bool reallyDirty);

2
GPU/GPUCommonHW.cpp
View File

@ -727,7 +727,7 @@ bool GPUCommonHW::GetOutputFramebuffer(GPUDebugBuffer &buffer) {
return framebufferManager_ ? framebufferManager_->GetOutputFramebuffer(buffer) : false;
}
std::vector<FramebufferInfo> GPUCommonHW::GetFramebufferList() const {
std::vector<const VirtualFramebuffer *> GPUCommonHW::GetFramebufferList() const {
return framebufferManager_->GetFramebufferList();
}

2
GPU/GPUCommonHW.h
View File

@ -23,7 +23,7 @@ public:
bool GetCurrentDepthbuffer(GPUDebugBuffer &buffer) override;
bool GetCurrentStencilbuffer(GPUDebugBuffer &buffer) override;
bool GetOutputFramebuffer(GPUDebugBuffer &buffer) override;
std::vector<FramebufferInfo> GetFramebufferList() const override;
std::vector<const VirtualFramebuffer *> GetFramebufferList() const override;
bool GetCurrentTexture(GPUDebugBuffer &buffer, int level, bool *isFramebuffer) override;
bool GetCurrentClut(GPUDebugBuffer &buffer) override;

13
GPU/GPUInterface.h
View File

@ -31,6 +31,7 @@
struct PspGeListArgs;
struct GPUgstate;
class PointerWrap;
struct VirtualFramebuffer;
enum DisplayListStatus {
// The list has been completed
@ -126,16 +127,6 @@ enum class GPUCopyFlag {
};
ENUM_CLASS_BITOPS(GPUCopyFlag);
// Used for debug
struct FramebufferInfo {
u32 fb_address;
u32 z_address;
int format;
u32 width;
u32 height;
void* fbo;
};
struct DisplayListStackEntry {
u32 pc;
u32 offsetAddr;
@ -271,7 +262,7 @@ public:
virtual void GetReportingInfo(std::string &primaryInfo, std::string &fullInfo) = 0;
virtual const std::list<int>& GetDisplayLists() = 0;
// TODO: Currently Qt only, needs to be cleaned up.
virtual std::vector<FramebufferInfo> GetFramebufferList() const = 0;
virtual std::vector<const VirtualFramebuffer *> GetFramebufferList() const = 0;
virtual s64 GetListTicks(int listid) const = 0;
// For debugging. The IDs returned are opaque, do not poke in them or display them in any way.

2
GPU/Software/SoftGpu.h
View File

@ -138,7 +138,7 @@ public:
void SetDisplayFramebuffer(u32 framebuf, u32 stride, GEBufferFormat format) override;
void CopyDisplayToOutput(bool reallyDirty) override;
void GetStats(char *buffer, size_t bufsize) override;
std::vector<FramebufferInfo> GetFramebufferList() const override { return std::vector<FramebufferInfo>(); }
std::vector<const VirtualFramebuffer *> GetFramebufferList() const override { return std::vector<const VirtualFramebuffer *>(); }
void InvalidateCache(u32 addr, int size, GPUInvalidationType type) override;
void PerformWriteFormattedFromMemory(u32 addr, int size, int width, GEBufferFormat format) override;
bool PerformMemoryCopy(u32 dest, u32 src, int size, GPUCopyFlag flags = GPUCopyFlag::NONE) override;