ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OGL: Fix texture_type checks in CreateTexture 

The FrameBufferManager::CreateTexture (from the OpenGL backend) method introduced by commit 69cedf41 incorrectly compares the texture variable (which contains a name provided by glGenTextures) against GL_TEXTURE_2D_MULTISAMPLE_ARRAY and GL_TEXTURE_2D_MULTISAMPLE.
It should instead use the texture_type variable for this (as done in the first branch of the if).
This commit is contained in:
Vincent Duvert 2017-03-17 23:53:56 +01:00
parent b7f605e88e
commit bbb5945375
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/OGL/FramebufferManager.cpp
View File

@ -63,7 +63,7 @@ GLuint FramebufferManager::CreateTexture(GLenum texture_type, GLenum internal_fo
glTexImage3D(texture_type, 0, internal_format, m_targetWidth, m_targetHeight, m_EFBLayers, 0, glTexImage3D(texture_type, 0, internal_format, m_targetWidth, m_targetHeight, m_EFBLayers, 0,
pixel_format, data_type, nullptr); pixel_format, data_type, nullptr);
} }
else if (texture == GL_TEXTURE_2D_MULTISAMPLE_ARRAY) else if (texture_type == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
{ {
if (g_ogl_config.bSupports3DTextureStorage) if (g_ogl_config.bSupports3DTextureStorage)
glTexStorage3DMultisample(texture_type, m_msaaSamples, internal_format, m_targetWidth, glTexStorage3DMultisample(texture_type, m_msaaSamples, internal_format, m_targetWidth,
@ -72,7 +72,7 @@ GLuint FramebufferManager::CreateTexture(GLenum texture_type, GLenum internal_fo
glTexImage3DMultisample(texture_type, m_msaaSamples, internal_format, m_targetWidth, glTexImage3DMultisample(texture_type, m_msaaSamples, internal_format, m_targetWidth,
m_targetHeight, m_EFBLayers, false); m_targetHeight, m_EFBLayers, false);
} }
else if (texture == GL_TEXTURE_2D_MULTISAMPLE) else if (texture_type == GL_TEXTURE_2D_MULTISAMPLE)
{ {
if (g_ogl_config.bSupports2DTextureStorage) if (g_ogl_config.bSupports2DTextureStorage)
glTexStorage2DMultisample(texture_type, m_msaaSamples, internal_format, m_targetWidth, glTexStorage2DMultisample(texture_type, m_msaaSamples, internal_format, m_targetWidth,