diff options
| author | Markus Wick <markus@selfnet.de> | 2015-07-26 20:52:29 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2015-07-26 20:52:29 +0200 |
| commit | 428e2ef9712f68ff6717d9d129f5696c05a77cfe (patch) | |
| tree | 6525e14366152e263a011517b1bcbd82b562b08c /Source/Core/VideoBackends/D3D/XFBEncoder.cpp | |
| parent | db42c7c3ba9689c2a385e4feee79fabfae5ce9ea (diff) | |
| parent | 9d055ba5f2a720778ce1f669e647266170650277 (diff) | |
Merge pull request #2778 from booto/im-sorry-d3d
Video: Trying to fix D3D/XFB disabled regression
Diffstat (limited to 'Source/Core/VideoBackends/D3D/XFBEncoder.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/XFBEncoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/D3D/XFBEncoder.cpp b/Source/Core/VideoBackends/D3D/XFBEncoder.cpp index c2bcac54df..560b13fa7a 100644 --- a/Source/Core/VideoBackends/D3D/XFBEncoder.cpp +++ b/Source/Core/VideoBackends/D3D/XFBEncoder.cpp @@ -288,7 +288,7 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR D3D::stateman->PushDepthState(m_xfbEncodeDepthState); D3D::stateman->PushRasterizerState(m_xfbEncodeRastState); - D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, FLOAT(width/4), FLOAT(height)); + D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, FLOAT(width/2), FLOAT(height)); D3D::context->RSSetViewports(1, &vp); D3D::stateman->SetInputLayout(m_quadLayout); @@ -300,7 +300,7 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR TargetRectangle targetRect = g_renderer->ConvertEFBRectangle(srcRect); XFBEncodeParams params = { 0 }; - params.Width = FLOAT(width/2); + params.Width = FLOAT(width); params.Height = FLOAT(height); params.TexLeft = FLOAT(targetRect.left) / g_renderer->GetTargetWidth(); params.TexTop = FLOAT(targetRect.top) / g_renderer->GetTargetHeight(); @@ -325,7 +325,7 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR // Copy to staging buffer - D3D11_BOX srcBox = CD3D11_BOX(0, 0, 0, width/4, height, 1); + D3D11_BOX srcBox = CD3D11_BOX(0, 0, 0, width/2, height, 1); D3D::context->CopySubresourceRegion(m_outStage, 0, 0, 0, 0, m_out, 0, &srcBox); // Clean up state @@ -353,7 +353,7 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR u8* src = (u8*)map.pData; for (unsigned int y = 0; y < height; ++y) { - memcpy(dst, src, width); + memcpy(dst, src, 2*width); dst += bpmem.copyMipMapStrideChannels*32; src += map.RowPitch; } |