diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2018-05-02 14:04:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 14:04:28 +0200 |
| commit | 71c8c65e6f3a5dd9064667c519205a7be9ee1560 (patch) | |
| tree | cec4b1a016d7d32211e9422226da765edf181bc8 /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | e89ac769fb79c5e1cfb1f185c876d7d59e229119 (diff) | |
| parent | 7a745e5b0d18cc703266ba7090cb91b52a7ed311 (diff) | |
Merge pull request #6730 from stenzek/no-gamma-param
D3D: Drop gamma parameter from util draw helper
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 40e02f4e12..b179597204 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -870,13 +870,13 @@ void Renderer::BlitScreen(TargetRectangle src, TargetRectangle dst, D3DTexture2D D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), - VertexShaderCache::GetSimpleInputLayout(), nullptr, 1.0f, 0); + VertexShaderCache::GetSimpleInputLayout(), nullptr, 0); D3D::context->RSSetViewports(1, &rightVp); D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), - VertexShaderCache::GetSimpleInputLayout(), nullptr, 1.0f, 1); + VertexShaderCache::GetSimpleInputLayout(), nullptr, 1); } else if (g_ActiveConfig.stereo_mode == StereoMode::Nvidia3DVision) { @@ -895,13 +895,13 @@ void Renderer::BlitScreen(TargetRectangle src, TargetRectangle dst, D3DTexture2D D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), - VertexShaderCache::GetSimpleInputLayout(), nullptr, 1.0f, 0); + VertexShaderCache::GetSimpleInputLayout(), nullptr, 0); D3D::context->RSSetViewports(1, &rightVp); D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), - VertexShaderCache::GetSimpleInputLayout(), nullptr, 1.0f, 1); + VertexShaderCache::GetSimpleInputLayout(), nullptr, 1); // Copy the left eye to the backbuffer, if Nvidia 3D Vision is enabled it should // recognize the signature and automatically include the right eye frame. @@ -926,7 +926,7 @@ void Renderer::BlitScreen(TargetRectangle src, TargetRectangle dst, D3DTexture2D nullptr; D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, pixelShader, VertexShaderCache::GetSimpleVertexShader(), - VertexShaderCache::GetSimpleInputLayout(), geomShader, 1.0f); + VertexShaderCache::GetSimpleInputLayout(), geomShader); } } |
