piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 13:57:57 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6801 from stenzek/copy-filter-typo

Browse Source 
D3D/Vulkan: Fix incorrect clamp in EFB RAM copy
This commit is contained in:
Léo Lam 2018-05-11 10:36:47 +02:00 committed by GitHub
commit d1bb5249ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
View File

@ -110,7 +110,7 @@ void PSTextureEncoder::Encode(
encode_params.y_scale = y_scale; encode_params.y_scale = y_scale;
encode_params.gamma_rcp = 1.0f / gamma; encode_params.gamma_rcp = 1.0f / gamma;
encode_params.clamp_top = clamp_top ? src_rect.top / float(EFB_HEIGHT) : 0.0f; encode_params.clamp_top = clamp_top ? src_rect.top / float(EFB_HEIGHT) : 0.0f;
encode_params.clamp_bottom = clamp_bottom ? src_rect.bottom / float(EFB_HEIGHT) : 0.0f; encode_params.clamp_bottom = clamp_bottom ? src_rect.bottom / float(EFB_HEIGHT) : 1.0f;
for (size_t i = 0; i < filter_coefficients.size(); i++) for (size_t i = 0; i < filter_coefficients.size(); i++)
encode_params.filter_coefficients[i] = filter_coefficients[i]; encode_params.filter_coefficients[i] = filter_coefficients[i];

2
Source/Core/VideoBackends/Vulkan/TextureConverter.cpp
View File

@ -245,7 +245,7 @@ void TextureConverter::EncodeTextureToMemory(
encoder_params.y_scale = y_scale; encoder_params.y_scale = y_scale;
encoder_params.gamma_rcp = 1.0f / gamma; encoder_params.gamma_rcp = 1.0f / gamma;
encoder_params.clamp_top = clamp_top ? src_rect.top / float(EFB_HEIGHT) : 0.0f; encoder_params.clamp_top = clamp_top ? src_rect.top / float(EFB_HEIGHT) : 0.0f;
encoder_params.clamp_bottom = clamp_bottom ? src_rect.bottom / float(EFB_HEIGHT) : 0.0f; encoder_params.clamp_bottom = clamp_bottom ? src_rect.bottom / float(EFB_HEIGHT) : 1.0f;
for (size_t i = 0; i < filter_coefficients.size(); i++) for (size_t i = 0; i < filter_coefficients.size(); i++)
encoder_params.filter_coefficients[i] = filter_coefficients[i]; encoder_params.filter_coefficients[i] = filter_coefficients[i];
u8* ubo_ptr = draw.AllocatePSUniforms(sizeof(EFBEncodeParams)); u8* ubo_ptr = draw.AllocatePSUniforms(sizeof(EFBEncodeParams));