diff options
| author | Léo Lam <leolino.lam@gmail.com> | 2018-03-16 18:13:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 18:13:32 +0100 |
| commit | 76eee7095ed5de07f2c9cf1394075c7480d0ce40 (patch) | |
| tree | 840fcdbc69b82dd947b7f4549c01be5146e19c26 /Source/Core/VideoBackends/D3D/DXTexture.cpp | |
| parent | 328585ef17386f3a27cae86c2863ede5a28971ef (diff) | |
| parent | 75f5fcdfee4cd643aa347ea69db05c595ed39caf (diff) | |
Merge pull request #6446 from lioncash/assert-param
Assert: Remove unused parameter from DEBUG_ASSERT
Diffstat (limited to 'Source/Core/VideoBackends/D3D/DXTexture.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/DXTexture.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/D3D/DXTexture.cpp b/Source/Core/VideoBackends/D3D/DXTexture.cpp index 4953c0c3a7..f899f62f0e 100644 --- a/Source/Core/VideoBackends/D3D/DXTexture.cpp +++ b/Source/Core/VideoBackends/D3D/DXTexture.cpp @@ -193,11 +193,10 @@ void DXTexture::ResolveFromTexture(const AbstractTexture* src, const MathUtil::R u32 layer, u32 level) { const DXTexture* srcentry = static_cast<const DXTexture*>(src); - DEBUG_ASSERT(VIDEO, m_config.samples > 1 && m_config.width == srcentry->m_config.width && - m_config.height == srcentry->m_config.height && m_config.samples == 1); - DEBUG_ASSERT(VIDEO, - rect.left + rect.GetWidth() <= static_cast<int>(srcentry->m_config.width) && - rect.top + rect.GetHeight() <= static_cast<int>(srcentry->m_config.height)); + 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(rect.left + rect.GetWidth() <= static_cast<int>(srcentry->m_config.width) && + rect.top + rect.GetHeight() <= static_cast<int>(srcentry->m_config.height)); D3D::context->ResolveSubresource( m_texture->GetTex(), D3D11CalcSubresource(level, layer, m_config.levels), |