diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-03-18 08:35:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-18 08:35:44 +0100 |
| commit | 609d1958223a29f55ad491bb4e37db00a7683dba (patch) | |
| tree | cb7fb14d362cb622083620b615b420024a2acdec /Source/Core | |
| parent | 8669426b0baf1c1c1e4e2d2b09bde03434032519 (diff) | |
| parent | bbb59453757e706c3a68ae43c50b23d7072fbc4f (diff) | |
Merge pull request #5100 from VinDuv/fix-texture-type-checks
OGL: Fix texture_type checks in FrameBufferManager::CreateTexture
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/FramebufferManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index 17244db24e..5fc1651285 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp @@ -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, 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) 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, 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) glTexStorage2DMultisample(texture_type, m_msaaSamples, internal_format, m_targetWidth, |