diff options
| author | Markus Wick <markus+github@selfnet.de> | 2014-12-26 13:25:33 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2014-12-26 13:25:33 +0100 |
| commit | a86865d1c42baced251204f1474bed65727637bc (patch) | |
| tree | 7be2bb799f930fd150488232ae16a4a54f99318c /Source/Core/VideoBackends/D3D/XFBEncoder.cpp | |
| parent | f71c4b5768579aff6986543c10ed8b24169e2589 (diff) | |
| parent | 833513f38413dc0f6af47067b223125c3de3eeaf (diff) | |
Merge pull request #1740 from Armada651/stereo-xfb
Support stereoscopy with Virtual XFB
Diffstat (limited to 'Source/Core/VideoBackends/D3D/XFBEncoder.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/XFBEncoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/D3D/XFBEncoder.cpp b/Source/Core/VideoBackends/D3D/XFBEncoder.cpp index 955fb38bc8..9e95e1ea74 100644 --- a/Source/Core/VideoBackends/D3D/XFBEncoder.cpp +++ b/Source/Core/VideoBackends/D3D/XFBEncoder.cpp @@ -78,7 +78,7 @@ static const char XFB_ENCODE_PS[] = "} Params;\n" "}\n" -"Texture2D EFBTexture : register(t0);\n" +"Texture2DArray EFBTexture : register(t0);\n" "sampler EFBSampler : register(s0);\n" // GameCube/Wii uses the BT.601 standard algorithm for converting to YCbCr; see @@ -92,7 +92,7 @@ static const char XFB_ENCODE_PS[] = "float3 SampleEFB(float2 coord)\n" "{\n" "float2 texCoord = lerp(float2(Params.TexLeft,Params.TexTop), float2(Params.TexRight,Params.TexBottom), coord / float2(Params.Width,Params.Height));\n" - "return EFBTexture.Sample(EFBSampler, texCoord).rgb;\n" + "return EFBTexture.Sample(EFBSampler, float3(texCoord, 0)).rgb;\n" "}\n" "void main(out float4 ocol0 : SV_Target, in float4 Pos : SV_Position, in float2 Coord : ENCODECOORD)\n" @@ -311,7 +311,7 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR D3D::context->OMSetRenderTargets(1, &m_outRTV, nullptr); - ID3D11ShaderResourceView* pEFB = FramebufferManager::GetEFBColorTexture()->GetSRV(); + ID3D11ShaderResourceView* pEFB = FramebufferManager::GetResolvedEFBColorTexture()->GetSRV(); D3D::stateman->SetVertexConstants(m_encodeParams); D3D::stateman->SetPixelConstants(m_encodeParams); |