New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vulkan: Fix crash when Core initialisation fails #6100

Merged
merged 1 commit into from Oct 11, 2017

Conversation

4 participants
@leoetlino
Member

leoetlino commented Oct 4, 2017

The Vulkan backend was not shutting down the AsyncShaderCompiler and some other instances, causing asserts to hit, followed by a hard crash.

@Helios747

This comment has been minimized.

Show comment
Hide comment
@Helios747

Helios747 Oct 4, 2017

Contributor

async shaders causing crashing?

raises pitchfork WELL DUH

anyways it looks ok to me but let a graphics person merge.

Contributor

Helios747 commented Oct 4, 2017

async shaders causing crashing?

raises pitchfork WELL DUH

anyways it looks ok to me but let a graphics person merge.

g_vulkan_context.reset();
ShutdownShared();
UnloadVulkanLibrary();
Shutdown();

This comment has been minimized.

@iwubcode

iwubcode Oct 6, 2017

Contributor

If we're going to do this, shouldn't we be calling Shutdown() in all the 'false' cases?

@iwubcode

iwubcode Oct 6, 2017

Contributor

If we're going to do this, shouldn't we be calling Shutdown() in all the 'false' cases?

This comment has been minimized.

@iwubcode

iwubcode Oct 6, 2017

Contributor

(or maybe if we return false in Initialize we call shutdown then and remove all the reset/unload/etc stuff?)

@iwubcode

iwubcode Oct 6, 2017

Contributor

(or maybe if we return false in Initialize we call shutdown then and remove all the reset/unload/etc stuff?)

This comment has been minimized.

@stenzek

stenzek Oct 8, 2017

Contributor

+1 on this, should be safe to do.

@stenzek

stenzek Oct 8, 2017

Contributor

+1 on this, should be safe to do.

This comment has been minimized.

@leoetlino

leoetlino Oct 8, 2017

Member

Good idea, I've replaced ShutdownShared(); UnloadVulkanLibrary(); with calls to Shutdown();.

@leoetlino

leoetlino Oct 8, 2017

Member

Good idea, I've replaced ShutdownShared(); UnloadVulkanLibrary(); with calls to Shutdown();.

@stenzek

stenzek approved these changes Oct 8, 2017

LGTM otherwise.

Vulkan: Fix crash when Core initialisation fails
The Vulkan backend was not shutting down the AsyncShaderCompiler and
some other instances, causing asserts to hit, followed by a hard crash.

@leoetlino leoetlino merged commit 8163fa1 into dolphin-emu:master Oct 11, 2017

10 checks passed

default Very basic checks passed, handed off to Buildbot.
Details
lint Build succeeded on builder lint
Details
pr-android Build succeeded on builder pr-android
Details
pr-deb-dbg-x64 Build succeeded on builder pr-deb-dbg-x64
Details
pr-deb-x64 Build succeeded on builder pr-deb-x64
Details
pr-freebsd-x64 Build succeeded on builder pr-freebsd-x64
Details
pr-osx-x64 Build succeeded on builder pr-osx-x64
Details
pr-ubu-x64 Build succeeded on builder pr-ubu-x64
Details
pr-win-dbg-x64 Build succeeded on builder pr-win-dbg-x64
Details
pr-win-x64 Build succeeded on builder pr-win-x64
Details

@leoetlino leoetlino deleted the leoetlino:vulkan-shutdown branch Oct 11, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment