CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

texture_cache/surface_base: Fix out of bounds texture views 

Some texture views were being created out of bounds (with more layers or
mipmaps than what the original texture has). This is because of a
miscalculation in mipmap bounding. end_layer and end_mipmap are out of
bounds (e.g. layer 6 in a cubemap), there's no need to add one more
there.

Fixes OpenGL errors and Vulkan crashes on Splatoon 2.
merge-requests/60/head
ReinUsesLisp 2019-11-29 16:51:14 +07:00
parent e3ee017e91
commit ff64c3951a
No known key found for this signature in database
GPG Key ID: 2DFC508897B39CFE
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_core/texture_cache/surface_base.h
Unescape Escape View File

@ -254,16 +254,14 @@ public:
if (!layer_mipmap) { if (!layer_mipmap) {
return {}; return {};
} }
const u32 end_layer{layer_mipmap->first}; const auto [end_layer, end_mipmap] = *layer_mipmap;
const u32 end_mipmap{layer_mipmap->second};
if (layer != end_layer) { if (layer != end_layer) {
if (mipmap == 0 && end_mipmap == 0) { if (mipmap == 0 && end_mipmap == 0) {
return GetView(ViewParams(view_params.target, layer, end_layer - layer + 1, 0, 1)); return GetView(ViewParams(view_params.target, layer, end_layer - layer, 0, 1));
} }
return {}; return {};
} else { } else {
return GetView( return GetView(ViewParams(view_params.target, layer, 1, mipmap, end_mipmap - mipmap));
ViewParams(view_params.target, layer, 1, mipmap, end_mipmap - mipmap + 1));
} }
} }
@ -278,8 +276,7 @@ public:
if (!layer_mipmap) { if (!layer_mipmap) {
return {}; return {};
} }
const u32 layer{layer_mipmap->first}; const auto [layer, mipmap] = *layer_mipmap;
const u32 mipmap{layer_mipmap->second};
if (GetMipmapSize(mipmap) != candidate_size) { if (GetMipmapSize(mipmap) != candidate_size) {
return EmplaceIrregularView(view_params, view_addr, candidate_size, mipmap, layer); return EmplaceIrregularView(view_params, view_addr, candidate_size, mipmap, layer);
} }