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

More vulkan fixes

Browse source
This commit is contained in:
Henrik Rydgard 2017-05-07 10:53:04 +02:00
parent 5974e0ee6d
commit ff6fcc9179
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
GPU/Vulkan/GPU_Vulkan.cpp
View file

@ -159,6 +159,7 @@ GPU_Vulkan::GPU_Vulkan(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
GPU_Vulkan::~GPU_Vulkan() { GPU_Vulkan::~GPU_Vulkan() {
framebufferManagerVulkan_->DestroyAllFBOs(); framebufferManagerVulkan_->DestroyAllFBOs();
depalShaderCache_.Clear(); depalShaderCache_.Clear();
delete textureCacheVulkan_;
delete pipelineManager_; delete pipelineManager_;
delete shaderManagerVulkan_; delete shaderManagerVulkan_;
} }

2
Windows/GPU/WindowsVulkanContext.cpp
View file

@ -138,6 +138,8 @@ static VkBool32 VKAPI_CALL Vulkan_Dbg(VkDebugReportFlagsEXT msgFlags, VkDebugRep
return false; return false;
if (msgCode == 11) if (msgCode == 11)
return false; return false;
if (msgCode == 63 && startsWith(pMsg, "vkCmdClearAttachments() issued on command buffer "))
return false;
#ifdef _WIN32 #ifdef _WIN32
std::string msg = message.str(); std::string msg = message.str();

6
ext/native/thin3d/thin3d_vulkan.cpp
View file

@ -262,11 +262,12 @@ public:
class VKPipeline : public Pipeline { class VKPipeline : public Pipeline {
public: public:
VKPipeline(size_t size) { VKPipeline(VulkanContext *vulkan, size_t size) : vulkan_(vulkan) {
uboSize_ = (int)size; uboSize_ = (int)size;
ubo_ = new uint8_t[uboSize_]; ubo_ = new uint8_t[uboSize_];
} }
~VKPipeline() { ~VKPipeline() {
vulkan_->Delete().QueueDeletePipeline(vkpipeline);
delete[] ubo_; delete[] ubo_;
} }
@ -292,6 +293,7 @@ public:
int dynamicUniformSize = 0; int dynamicUniformSize = 0;
private: private:
VulkanContext *vulkan_;
uint8_t *ubo_; uint8_t *ubo_;
int uboSize_; int uboSize_;
}; };
@ -831,7 +833,7 @@ VkDescriptorSet VKContext::GetOrCreateDescriptorSet(VkBuffer buf) {
} }
Pipeline *VKContext::CreateGraphicsPipeline(const PipelineDesc &desc) { Pipeline *VKContext::CreateGraphicsPipeline(const PipelineDesc &desc) {
VKPipeline *pipeline = new VKPipeline(desc.uniformDesc ? desc.uniformDesc->uniformBufferSize : 16 * sizeof(float)); VKPipeline *pipeline = new VKPipeline(vulkan_, desc.uniformDesc ? desc.uniformDesc->uniformBufferSize : 16 * sizeof(float));
VKInputLayout *input = (VKInputLayout *)desc.inputLayout; VKInputLayout *input = (VKInputLayout *)desc.inputLayout;
VKBlendState *blend = (VKBlendState *)desc.blend; VKBlendState *blend = (VKBlendState *)desc.blend;
VKDepthStencilState *depth = (VKDepthStencilState *)desc.depthStencil; VKDepthStencilState *depth = (VKDepthStencilState *)desc.depthStencil;