mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-04-21 03:54:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

initial preparations for subresources upload

Browse source
This commit is contained in:
psucien 2024-07-19 21:29:31 +02:00
parent 9c49844107
commit f3338e7080
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/video_core/amdgpu/resource.h
View file

@ -227,11 +227,6 @@ struct Image {
bool IsTiled() const {
return GetTilingMode() != TilingMode::Display_Linear;
}
size_t GetSize() const {
// TODO: Derive this properly from tiling params
return Pitch() * (height + 1) * NumComponents(GetDataFmt());
}
};
static_assert(sizeof(Image) == 32); // 256bits

12
src/video_core/texture_cache/image_info.cpp
View file

@ -128,6 +128,7 @@ ImageInfo::ImageInfo(const Libraries::VideoOut::BufferAttributeGroup& group,
size.width = attrib.width;
size.height = attrib.height;
pitch = attrib.tiling_mode == TilingMode::Linear ? size.width : (size.width + 127) & (~127);
usage.vo_buffer = true;
const bool is_32bpp = attrib.pixel_format != VideoOutFormat::A16R16G16B16Float;
ASSERT(is_32bpp);
@ -141,7 +142,7 @@ ImageInfo::ImageInfo(const Libraries::VideoOut::BufferAttributeGroup& group,
guest_size_bytes = pitch * ((size.height + 63) & (~63)) * 4;
}
}
usage.vo_buffer = true;
mips_layout.emplace_back(0, guest_size_bytes);
}
ImageInfo::ImageInfo(const AmdGpu::Liverpool::ColorBuffer& buffer,
@ -161,7 +162,9 @@ ImageInfo::ImageInfo(const AmdGpu::Liverpool::ColorBuffer& buffer,
usage.render_target = true;
guest_address = buffer.Address();
guest_size_bytes = buffer.GetColorSliceSize() * buffer.NumSlices();
const auto color_slice_sz = buffer.GetColorSliceSize();
guest_size_bytes = color_slice_sz * buffer.NumSlices();
mips_layout.emplace_back(0, color_slice_sz);
}
ImageInfo::ImageInfo(const AmdGpu::Liverpool::DepthBuffer& buffer, u32 num_slices,
@ -179,7 +182,9 @@ ImageInfo::ImageInfo(const AmdGpu::Liverpool::DepthBuffer& buffer, u32 num_slice
usage.depth_target = true;
guest_address = buffer.Address();
guest_size_bytes = buffer.GetDepthSliceSize() * num_slices;
const auto depth_slice_sz = buffer.GetDepthSliceSize();
guest_size_bytes = depth_slice_sz * num_slices;
mips_layout.emplace_back(0, depth_slice_sz);
}
ImageInfo::ImageInfo(const AmdGpu::Image& image) noexcept {
@ -198,7 +203,6 @@ ImageInfo::ImageInfo(const AmdGpu::Image& image) noexcept {
usage.texture = true;
guest_address = image.Address();
guest_size_bytes = image.GetSize();
mips_layout.reserve(resources.levels);
const auto num_bits = NumBits(image.GetDataFmt());

1
src/video_core/texture_cache/image_info.h
View file

@ -43,6 +43,7 @@ struct ImageInfo {
} usage{}; // Usage data tracked during image lifetime
bool is_cube = false;
bool is_volume = false;
bool is_tiled = false;
bool is_read_only = false;
vk::Format pixel_format = vk::Format::eUndefined;

15
src/video_core/texture_cache/texture_cache.cpp
View file

@ -246,21 +246,24 @@ void TextureCache::RefreshImage(Image& image) {
return;
}
ASSERT(image.info.resources.levels == image.info.mips_layout.size());
const u8* image_data = reinterpret_cast<const u8*>(image.cpu_addr);
for (u32 m = 0; m < image.info.resources.levels; m++) {
const u32 width = image.info.size.width >> m;
const u32 height = image.info.size.height >> m;
const u32 map_size = width * height * image.info.resources.layers;
const u32 width = std::max(image.info.size.width >> m, 1u);
const u32 height = std::max(image.info.size.height >> m, 1u);
const u32 depth = image.info.is_volume ? std::max(image.info.size.depth >> m, 1u) : 1u;
const u32 map_size = image.info.mips_layout[m].second * image.info.resources.layers;
// Upload data to the staging buffer.
const auto [data, offset, _] = staging.Map(map_size, 16);
if (image.info.is_tiled) {
ConvertTileToLinear(data, image_data, width, height, Config::isNeoMode());
} else {
std::memcpy(data, image_data, map_size);
std::memcpy(data,
image_data + image.info.mips_layout[m].first * image.info.resources.layers,
map_size);
}
staging.Commit(map_size);
image_data += map_size;
// Copy to the image.
const vk::BufferImageCopy image_copy = {
@ -274,7 +277,7 @@ void TextureCache::RefreshImage(Image& image) {
.layerCount = u32(image.info.resources.layers),
},
.imageOffset = {0, 0, 0},
.imageExtent = {width, height, 1},
.imageExtent = {width, height, depth},
};
scheduler.EndRendering();