Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove an unused VulkanPushBuffer.

Browse source 
Saves about 0.75MB of VRAM, but mainly just to clean things up.

I think I meant to use this one instead of grabbing the one from
DrawEngine in the TextureCache.
This commit is contained in:
Henrik Rydgård 2023-03-14 23:38:52 +01:00
parent 38517a4609
commit effbe6376a
3 changed files with 1 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
GPU/Vulkan/GPU_Vulkan.cpp
View file

@ -295,13 +295,8 @@ void GPU_Vulkan::BeginHostFrame() {
VulkanContext *vulkan = (VulkanContext *)draw_->GetNativeObject(Draw::NativeObject::CONTEXT); VulkanContext *vulkan = (VulkanContext *)draw_->GetNativeObject(Draw::NativeObject::CONTEXT);
int curFrame = vulkan->GetCurFrame(); int curFrame = vulkan->GetCurFrame();
FrameData &frame = frameData_[curFrame];
frame.push_->Reset();
frame.push_->Begin(vulkan);
framebufferManager_->BeginFrame(); framebufferManager_->BeginFrame();
textureCacheVulkan_->SetPushBuffer(frameData_[curFrame].push_);
shaderManagerVulkan_->DirtyShader(); shaderManagerVulkan_->DirtyShader();
gstate_c.Dirty(DIRTY_ALL); gstate_c.Dirty(DIRTY_ALL);
@ -329,9 +324,6 @@ void GPU_Vulkan::BeginHostFrame() {
void GPU_Vulkan::EndHostFrame() { void GPU_Vulkan::EndHostFrame() {
VulkanContext *vulkan = (VulkanContext *)draw_->GetNativeObject(Draw::NativeObject::CONTEXT); VulkanContext *vulkan = (VulkanContext *)draw_->GetNativeObject(Draw::NativeObject::CONTEXT);
int curFrame = vulkan->GetCurFrame();
FrameData &frame = frameData_[curFrame];
frame.push_->End();
drawEngine_.EndFrame(); drawEngine_.EndFrame();
@ -395,15 +387,7 @@ void GPU_Vulkan::FinishDeferred() {
void GPU_Vulkan::InitDeviceObjects() { void GPU_Vulkan::InitDeviceObjects() {
INFO_LOG(G3D, "GPU_Vulkan::InitDeviceObjects"); INFO_LOG(G3D, "GPU_Vulkan::InitDeviceObjects");
VulkanContext *vulkan = (VulkanContext *)draw_->GetNativeObject(Draw::NativeObject::CONTEXT);
// Initialize framedata
for (int i = 0; i < VulkanContext::MAX_INFLIGHT_FRAMES; i++) {
_assert_(!frameData_[i].push_);
VkBufferUsageFlags usage = VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
frameData_[i].push_ = new VulkanPushBuffer(vulkan, "gpuPush", 256 * 1024, usage, PushBufferType::CPU_TO_GPU);
}
VulkanRenderManager *rm = (VulkanRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
uint32_t hacks = 0; uint32_t hacks = 0;
if (PSP_CoreParameter().compat.flags().MGS2AcidHack) if (PSP_CoreParameter().compat.flags().MGS2AcidHack)
hacks |= QUEUE_HACK_MGS2_ACID; hacks |= QUEUE_HACK_MGS2_ACID;
@ -414,21 +398,13 @@ void GPU_Vulkan::InitDeviceObjects() {
hacks |= QUEUE_HACK_RENDERPASS_MERGE; hacks |= QUEUE_HACK_RENDERPASS_MERGE;
if (hacks) { if (hacks) {
VulkanRenderManager *rm = (VulkanRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
rm->GetQueueRunner()->EnableHacks(hacks); rm->GetQueueRunner()->EnableHacks(hacks);
} }
} }
void GPU_Vulkan::DestroyDeviceObjects() { void GPU_Vulkan::DestroyDeviceObjects() {
INFO_LOG(G3D, "GPU_Vulkan::DestroyDeviceObjects"); INFO_LOG(G3D, "GPU_Vulkan::DestroyDeviceObjects");
for (int i = 0; i < VulkanContext::MAX_INFLIGHT_FRAMES; i++) {
if (frameData_[i].push_) {
VulkanContext *vulkan = (VulkanContext *)draw_->GetNativeObject(Draw::NativeObject::CONTEXT);
frameData_[i].push_->Destroy(vulkan);
delete frameData_[i].push_;
frameData_[i].push_ = nullptr;
}
}
// Need to turn off hacks when shutting down the GPU. Don't want them running in the menu. // Need to turn off hacks when shutting down the GPU. Don't want them running in the menu.
if (draw_) { if (draw_) {
VulkanRenderManager *rm = (VulkanRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER); VulkanRenderManager *rm = (VulkanRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);

6
GPU/Vulkan/GPU_Vulkan.h
View file

@ -84,12 +84,6 @@ private:
// Manages state and pipeline objects // Manages state and pipeline objects
PipelineManagerVulkan *pipelineManager_; PipelineManagerVulkan *pipelineManager_;
struct FrameData {
VulkanPushBuffer *push_;
};
FrameData frameData_[VulkanContext::MAX_INFLIGHT_FRAMES]{};
Path shaderCachePath_; Path shaderCachePath_;
std::atomic<bool> shaderCacheLoaded_{}; std::atomic<bool> shaderCacheLoaded_{};
}; };

4
GPU/Vulkan/TextureCacheVulkan.h
View file

@ -66,9 +66,6 @@ public:
void SetDrawEngine(DrawEngineVulkan *td) { void SetDrawEngine(DrawEngineVulkan *td) {
drawEngine_ = td; drawEngine_ = td;
} }
void SetPushBuffer(VulkanPushBuffer *push) {
push_ = push;
}
void ForgetLastTexture() override {} void ForgetLastTexture() override {}
void NotifyConfigChanged() override; void NotifyConfigChanged() override;
@ -106,7 +103,6 @@ private:
void CompileScalingShader(); void CompileScalingShader();
VulkanDeviceAllocator *allocator_ = nullptr; VulkanDeviceAllocator *allocator_ = nullptr;
VulkanPushBuffer *push_ = nullptr;
VulkanComputeShaderManager computeShaderManager_; VulkanComputeShaderManager computeShaderManager_;