Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rsx: Downgrade depth-1 3D images to 2D #11593

Merged
merged 3 commits into from
Mar 1, 2022
Merged

rsx: Downgrade depth-1 3D images to 2D #11593

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e47416
rsx: Downgrade depth-1 3D images to 2D
kd-11 Feb 28, 2022
76778b9
Cosmetic fixup
kd-11 Mar 1, 2022
f483d1b
Merge branch 'master' into bustup
kd-11 Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 26 additions & 17 deletions rpcs3/Emu/RSX/Common/texture_cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2092,20 +2092,6 @@ namespace rsx

switch (extended_dimension)
{
case rsx::texture_dimension_extended::texture_dimension_1d:
attributes.depth = 1;
attributes.height = 1;
attributes.slice_h = 1;
scale.height = scale.depth = 0.f;
subsurface_count = 1;
required_surface_height = 1;
break;
case rsx::texture_dimension_extended::texture_dimension_2d:
attributes.depth = 1;
scale.depth = 0.f;
subsurface_count = options.is_compressed_format? 1 : tex.get_exact_mipmap_count();
attributes.slice_h = required_surface_height = attributes.height;
break;
case rsx::texture_dimension_extended::texture_dimension_cubemap:
attributes.depth = 6;
subsurface_count = 1;
Expand All @@ -2115,10 +2101,33 @@ namespace rsx
break;
case rsx::texture_dimension_extended::texture_dimension_3d:
attributes.depth = tex.depth();
if (attributes.depth > 1)
{
subsurface_count = 1;
tex_size = static_cast<u32>(get_texture_size(tex));
required_surface_height = tex_size / attributes.pitch;
attributes.slice_h = required_surface_height / attributes.depth;
break;
}
else
kd-11 marked this conversation as resolved.
Show resolved Hide resolved
{
// Downgrade to 2D
extended_dimension = rsx::texture_dimension_extended::texture_dimension_2d;
[[ fallthrough ]];
}
case rsx::texture_dimension_extended::texture_dimension_2d:
attributes.depth = 1;
scale.depth = 0.f;
subsurface_count = options.is_compressed_format? 1 : tex.get_exact_mipmap_count();
attributes.slice_h = required_surface_height = attributes.height;
break;
case rsx::texture_dimension_extended::texture_dimension_1d:
attributes.depth = 1;
attributes.height = 1;
attributes.slice_h = 1;
scale.height = scale.depth = 0.f;
subsurface_count = 1;
tex_size = static_cast<u32>(get_texture_size(tex));
required_surface_height = tex_size / attributes.pitch;
attributes.slice_h = required_surface_height / attributes.depth;
required_surface_height = 1;
break;
default:
fmt::throw_exception("Unsupported texture dimension %d", static_cast<int>(extended_dimension));
Expand Down
1 change: 1 addition & 0 deletions rpcs3/Emu/RSX/VK/vkutils/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace vk
dim_limit = (info.flags == VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT) ? gpu_limits.maxImageDimensionCube : gpu_limits.maxImageDimension2D;
break;
case VK_IMAGE_TYPE_3D:
ensure(info.extent.depth > 1);
longest_dim = std::max({ info.extent.width, info.extent.height, info.extent.depth });
dim_limit = gpu_limits.maxImageDimension3D;
break;
Expand Down