diff options
| author | OatmealDome <OatmealDome@users.noreply.github.com> | 2026-01-25 21:06:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-25 21:06:57 -0500 |
| commit | 168dbb0ab8453658b35e251c49c9e628ec07c6df (patch) | |
| tree | 9756317665b47a1308019a761b4887d87ef445ba /Source/Core/VideoBackends | |
| parent | 5bedfe7732360301dfc46021482fadc51952d543 (diff) | |
| parent | 169f99c14d6307db935d5dfe6c5900ffeb960a5e (diff) | |
Merge pull request #14302 from oltolm/opengl_assert
DX, OGL: fix assert
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/DXTexture.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/OGLTexture.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/D3D/DXTexture.cpp b/Source/Core/VideoBackends/D3D/DXTexture.cpp index 57e886e2fe..fd915297d6 100644 --- a/Source/Core/VideoBackends/D3D/DXTexture.cpp +++ b/Source/Core/VideoBackends/D3D/DXTexture.cpp @@ -174,8 +174,8 @@ void DXTexture::ResolveFromTexture(const AbstractTexture* src, const MathUtil::R u32 layer, u32 level) { const DXTexture* srcentry = static_cast<const DXTexture*>(src); - DEBUG_ASSERT(m_config.samples > 1 && m_config.width == srcentry->m_config.width && - m_config.height == srcentry->m_config.height && m_config.samples == 1); + DEBUG_ASSERT(m_config.samples == 1 && m_config.width == srcentry->m_config.width && + m_config.height == srcentry->m_config.height && srcentry->m_config.samples > 1); DEBUG_ASSERT(rect.left + rect.GetWidth() <= static_cast<int>(srcentry->m_config.width) && rect.top + rect.GetHeight() <= static_cast<int>(srcentry->m_config.height)); diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.cpp b/Source/Core/VideoBackends/OGL/OGLTexture.cpp index 036054f517..003a7ec442 100644 --- a/Source/Core/VideoBackends/OGL/OGLTexture.cpp +++ b/Source/Core/VideoBackends/OGL/OGLTexture.cpp @@ -269,8 +269,8 @@ void OGLTexture::ResolveFromTexture(const AbstractTexture* src, const MathUtil::Rectangle<int>& rect, u32 layer, u32 level) { const OGLTexture* srcentry = static_cast<const OGLTexture*>(src); - DEBUG_ASSERT(m_config.samples > 1 && m_config.width == srcentry->m_config.width && - m_config.height == srcentry->m_config.height && m_config.samples == 1); + DEBUG_ASSERT(m_config.samples == 1 && m_config.width == srcentry->m_config.width && + m_config.height == srcentry->m_config.height && srcentry->m_config.samples > 1); DEBUG_ASSERT(rect.left + rect.GetWidth() <= static_cast<int>(srcentry->m_config.width) && rect.top + rect.GetHeight() <= static_cast<int>(srcentry->m_config.height)); BlitFramebuffer(const_cast<OGLTexture*>(srcentry), rect, layer, level, rect, layer, level); |