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

TextureCache: don't create texture decoding resources if not enabled #6136

Merged
merged 1 commit into from Oct 22, 2017

Conversation

2 participants
@ligfx
Contributor

ligfx commented Oct 22, 2017

@stenzek

LGTM otherwise

@@ -69,7 +69,8 @@ TextureCache::TextureCache()
glBindTexture(GL_TEXTURE_BUFFER, m_palette_resolv_texture);
glTexBuffer(GL_TEXTURE_BUFFER, GL_R16UI, m_palette_stream_buffer->m_buffer);
CreateTextureDecodingResources();
if (g_ActiveConfig.backend_info.bSupportsGPUTextureDecoding)

This comment has been minimized.

@stenzek

stenzek Oct 22, 2017

Contributor

Should add this check in the destructor as well, line 80.

@stenzek

stenzek Oct 22, 2017

Contributor

Should add this check in the destructor as well, line 80.

This comment has been minimized.

@ligfx

ligfx Oct 22, 2017

Contributor

Done!

@ligfx

ligfx Oct 22, 2017

Contributor

Done!

@stenzek stenzek merged commit d57d7b7 into dolphin-emu:master Oct 22, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment