portaldevice/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #7659 from ameerj/overlap-overflow

Browse source 
texture_cache/util: Fix s32 overflow when resolving overlaps
This commit is contained in:
Fernando S 2022-01-01 22:10:29 +01:00 committed by GitHub
commit 214b9fc9a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video_core/texture_cache/util.cpp
View file

@ -364,14 +364,14 @@ template <u32 GOB_EXTENT>
[[nodiscard]] std::optional<SubresourceExtent> ResolveOverlapRightAddress2D( [[nodiscard]] std::optional<SubresourceExtent> ResolveOverlapRightAddress2D(
const ImageInfo& new_info, GPUVAddr gpu_addr, const ImageBase& overlap, bool strict_size) { const ImageInfo& new_info, GPUVAddr gpu_addr, const ImageBase& overlap, bool strict_size) {
const u32 layer_stride = new_info.layer_stride; const u64 layer_stride = new_info.layer_stride;
const s32 new_size = layer_stride * new_info.resources.layers; const u64 new_size = layer_stride * new_info.resources.layers;
const s32 diff = static_cast<s32>(overlap.gpu_addr - gpu_addr); const u64 diff = overlap.gpu_addr - gpu_addr;
if (diff > new_size) { if (diff > new_size) {
return std::nullopt; return std::nullopt;
} }
const s32 base_layer = diff / layer_stride; const s32 base_layer = static_cast<s32>(diff / layer_stride);
const s32 mip_offset = diff % layer_stride; const s32 mip_offset = static_cast<s32>(diff % layer_stride);
const std::array offsets = CalculateMipLevelOffsets(new_info); const std::array offsets = CalculateMipLevelOffsets(new_info);
const auto end = offsets.begin() + new_info.resources.levels; const auto end = offsets.begin() + new_info.resources.levels;
const auto it = std::find(offsets.begin(), end, static_cast<u32>(mip_offset)); const auto it = std::find(offsets.begin(), end, static_cast<u32>(mip_offset));