libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-04 16:06:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Another leak fix, buildfix

Browse Source
This commit is contained in:
Henrik Rydgard 2016-03-30 22:53:06 +02:00
parent 2b996db298
commit c2b66a0882
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GPU/Vulkan/DrawEngineVulkan.cpp
View File

@ -208,6 +208,7 @@ DrawEngineVulkan::~DrawEngineVulkan() {
delete nullTexture_;
}
delete[] uvScale;
vkDestroyPipelineLayout(vulkan_->GetDevice(), pipelineLayout_, nullptr);
}
void DrawEngineVulkan::BeginFrame() {

4
GPU/Vulkan/FramebufferVulkan.cpp
View File

@ -341,7 +341,7 @@ void FramebufferManagerVulkan::DrawPixels(VirtualFramebuffer *vfb, int dstX, int
vkCmdSetViewport(curCmd_, 0, 1, &vp);
MakePixelTexture(srcPixels, srcPixelFormat, srcStride, width, height);
DrawActiveTexture(drawPixelsTex_, dstX, dstY, width, height, vfb->bufferWidth, vfb->bufferHeight, 0.0f, 0.0f, 1.0f, 1.0f, nullptr, ROTATION_LOCKED_HORIZONTAL);
DrawActiveTexture(drawPixelsTex_, dstX, dstY, width, height, vfb->bufferWidth, vfb->bufferHeight, 0.0f, 0.0f, 1.0f, 1.0f, pipelineBasicTex_, ROTATION_LOCKED_HORIZONTAL);
textureCache_->ForgetLastTexture();
}
@ -455,7 +455,7 @@ void FramebufferManagerVulkan::DrawActiveTexture(VulkanTexture *texture, float x
// TODO: Choose linear or nearest appropriately, see GL impl.
vulkan2D_.BindDescriptorSet(cmd, texture->GetImageView(), linearSampler_);
vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineBasicTex_);
vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
VkBuffer vbuffer;
VkDeviceSize offset = push->Push(vtx, sizeof(vtx), &vbuffer);
vkCmdBindVertexBuffers(cmd, 0, 1, &vbuffer, &offset);

3
GPU/Vulkan/FramebufferVulkan.h
View File

@ -191,9 +191,6 @@ private:
ShaderManagerVulkan *shaderManager_;
DrawEngineVulkan *drawEngine_;
// Used for postprocessing tasks and in-render-pass plain 2D draws/blits.
VkPipelineLayout simplePipelineLayout_;
bool resized_;
AsyncPBOVulkan *pixelBufObj_;