dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-12-16 12:08:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge de293e96f3 into f7eaf13a4d

Browse Source
This commit is contained in:
jbm11208 2025-12-15 14:14:29 -05:00 committed by GitHub
commit 3548ae89e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/video_core/renderer_vulkan/vk_texture_runtime.cpp
View File

@ -1482,9 +1482,7 @@ void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) {
if (is_depth_stencil && !depth_traits.blit_support) {
LOG_WARNING(Render_Vulkan, "Depth scale unsupported by hardware");
return;
} // Check if texture filtering is enabled
const bool texture_filter_enabled =
Settings::values.texture_filter.GetValue() != Settings::TextureFilter::NoFilter;
}
// Always use consistent source and destination images for proper scaling
// When upscaling: source = unscaled (0), destination = scaled (1)
@ -1493,8 +1491,8 @@ void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) {
const vk::Image dst_image = up_scale ? Image(1) : Image(0);
scheduler->Record([src_image, aspect = Aspect(), filter = MakeFilter(pixel_format), dst_image,
src_access = AccessFlags(), dst_access = AccessFlags(), blit,
texture_filter_enabled](vk::CommandBuffer render_cmdbuf) {
src_access = AccessFlags(), dst_access = AccessFlags(),
blit](vk::CommandBuffer render_cmdbuf) {
// Adjust blitting parameters for filtered upscaling
const std::array source_offsets = {
vk::Offset3D{static_cast<s32>(blit.src_rect.left),
@ -1508,15 +1506,7 @@ void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) {
static_cast<s32>(blit.dst_rect.bottom), 0},
vk::Offset3D{static_cast<s32>(blit.dst_rect.right), static_cast<s32>(blit.dst_rect.top),
1},
}; // Ensure we're using the right filter for texture filtered upscaling
vk::Filter actual_filter;
if (texture_filter_enabled) {
// When texture filtering is enabled, always use LINEAR filtering
actual_filter = vk::Filter::eLinear;
} else {
// When texture filtering is disabled, use the filter appropriate for the texture format
actual_filter = filter;
}
};
const vk::ImageBlit blit_area = {
.srcSubresource{
@ -1585,7 +1575,7 @@ void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) {
vk::DependencyFlagBits::eByRegion, {}, {}, read_barriers);
render_cmdbuf.blitImage(src_image, vk::ImageLayout::eTransferSrcOptimal, dst_image,
vk::ImageLayout::eTransferDstOptimal, blit_area, actual_filter);
vk::ImageLayout::eTransferDstOptimal, blit_area, filter);
render_cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eTransfer,
vk::PipelineStageFlagBits::eAllCommands,