mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-28 18:33:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6329 from stenzek/vulkan-crash

Browse Source 
AbstractTexture: Fix crash in Vulkan backend when freeing texture
This commit is contained in:
Markus Wick 2018-01-26 11:19:13 +01:00 committed by GitHub
commit 8d16a40f86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoBackends/D3D/DXTexture.cpp
View File

@ -83,6 +83,7 @@ DXTexture::DXTexture(const TextureConfig& tex_config) : AbstractTexture(tex_conf
DXTexture::~DXTexture() DXTexture::~DXTexture()
{ {
g_renderer->UnbindTexture(this);
m_texture->Release(); m_texture->Release();
} }

1
Source/Core/VideoBackends/OGL/OGLTexture.cpp
View File

@ -121,6 +121,7 @@ OGLTexture::OGLTexture(const TextureConfig& tex_config) : AbstractTexture(tex_co
OGLTexture::~OGLTexture() OGLTexture::~OGLTexture()
{ {
g_renderer->UnbindTexture(this);
if (m_texId) if (m_texId)
glDeleteTextures(1, &m_texId); glDeleteTextures(1, &m_texId);

2
Source/Core/VideoBackends/Vulkan/VKTexture.cpp
View File

@ -93,7 +93,7 @@ std::unique_ptr<VKTexture> VKTexture::Create(const TextureConfig& tex_config)
VKTexture::~VKTexture() VKTexture::~VKTexture()
{ {
// Texture is automatically cleaned up, however, we don't want to leave it bound. // Texture is automatically cleaned up, however, we don't want to leave it bound.
StateTracker::GetInstance()->UnbindTexture(m_texture->GetView()); g_renderer->UnbindTexture(this);
if (m_framebuffer != VK_NULL_HANDLE) if (m_framebuffer != VK_NULL_HANDLE)
g_command_buffer_mgr->DeferFramebufferDestruction(m_framebuffer); g_command_buffer_mgr->DeferFramebufferDestruction(m_framebuffer);
} }

5
Source/Core/VideoCommon/AbstractTexture.cpp
View File

@ -15,11 +15,6 @@ AbstractTexture::AbstractTexture(const TextureConfig& c) : m_config(c)
{ {
} }
AbstractTexture::~AbstractTexture()
{
g_renderer->UnbindTexture(this);
}
bool AbstractTexture::Save(const std::string& filename, unsigned int level) bool AbstractTexture::Save(const std::string& filename, unsigned int level)
{ {
// We can't dump compressed textures currently (it would mean drawing them to a RGBA8 // We can't dump compressed textures currently (it would mean drawing them to a RGBA8

2
Source/Core/VideoCommon/AbstractTexture.h
View File

@ -15,7 +15,7 @@ class AbstractTexture
{ {
public: public:
explicit AbstractTexture(const TextureConfig& c); explicit AbstractTexture(const TextureConfig& c);
virtual ~AbstractTexture(); virtual ~AbstractTexture() = default;
virtual void CopyRectangleFromTexture(const AbstractTexture* src, virtual void CopyRectangleFromTexture(const AbstractTexture* src,
const MathUtil::Rectangle<int>& src_rect, u32 src_layer, const MathUtil::Rectangle<int>& src_rect, u32 src_layer,