piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5100 from VinDuv/fix-texture-type-checks

Browse Source 
OGL: Fix texture_type checks in FrameBufferManager::CreateTexture
This commit is contained in:
Markus Wick
2017-03-18 08:35:44 +01:00
committed by GitHub
parent 8669426b0b bbb5945375
commit 609d195822
1 changed files with 2 additions and 2 deletions
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,