The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 06:39:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

OGL: Bind the attributeless VAO before EFB copies.

Browse Source 
Fixes crashes in Zack & Wiki using an older NVIDIA driver.
This commit is contained in:
Unknown W. Brackets 2014-12-10 23:19:18 -08:00
parent 0861cb8744
commit 290fd545e6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/VideoBackends/OGL/GLUtil.cpp
View File

@ -141,9 +141,12 @@ void OpenGL_BindAttributelessVAO()
void OpenGL_DeleteAttributelessVAO() void OpenGL_DeleteAttributelessVAO()
{ {
glDeleteVertexArrays(1, &attributelessVAO); if (attributelessVAO)
glDeleteBuffers(1, &attributelessVBO); {
glDeleteVertexArrays(1, &attributelessVAO);
glDeleteBuffers(1, &attributelessVBO);
attributelessVAO = 0; attributelessVAO = 0;
attributelessVBO = 0; attributelessVBO = 0;
}
} }

2
Source/Core/VideoBackends/OGL/TextureCache.cpp
View File

@ -249,6 +249,8 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
{ {
FramebufferManager::SetFramebuffer(framebuffer); FramebufferManager::SetFramebuffer(framebuffer);
OpenGL_BindAttributelessVAO();
glActiveTexture(GL_TEXTURE0+9); glActiveTexture(GL_TEXTURE0+9);
glBindTexture(GL_TEXTURE_2D_ARRAY, read_texture); glBindTexture(GL_TEXTURE_2D_ARRAY, read_texture);