eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

fix texture cache and nifm log
All checks were successful
eden-license / license-header (pull_request) Successful in 20s
Details

Browse source
This commit is contained in:
Maufeat 2025-09-22 16:49:59 +02:00 • committed by crueter
parent 49f29e5071
commit e15ed6cd2f
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/hle/service/nifm/nifm.cpp
View file

@ -381,7 +381,7 @@ public:
private: private:
void Submit(HLERequestContext& ctx) { void Submit(HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_DEBUG(Service_NIFM, "(STUBBED) called");
if (state == RequestState::NotSubmitted) { if (state == RequestState::NotSubmitted) {
UpdateState(RequestState::OnHold); UpdateState(RequestState::OnHold);
@ -392,7 +392,7 @@ private:
} }
void GetRequestState(HLERequestContext& ctx) { void GetRequestState(HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_DEBUG(Service_NIFM, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
@ -424,7 +424,7 @@ private:
} }
void GetResult(HLERequestContext& ctx) { void GetResult(HLERequestContext& ctx) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_DEBUG(Service_NIFM, "(STUBBED) called");
const auto result = [this] { const auto result = [this] {
const auto has_connection = Network::GetHostIPv4Address().has_value() && const auto has_connection = Network::GetHostIPv4Address().has_value() &&
@ -486,7 +486,7 @@ private:
} }
void UpdateState(RequestState new_state) { void UpdateState(RequestState new_state) {
LOG_WARNING(Service_NIFM, "(STUBBED) called"); LOG_DEBUG(Service_NIFM, "(STUBBED) called");
state = new_state; state = new_state;
event1->Signal(); event1->Signal();
} }

14
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View file

@ -1377,13 +1377,17 @@ void TextureCacheRuntime::CopyImage(Image& dst, Image& src,
// As per the size-compatible formats section of vulkan, copy manually via ReinterpretImage // As per the size-compatible formats section of vulkan, copy manually via ReinterpretImage
// these images that aren't size-compatible // these images that aren't size-compatible
if (BytesPerBlock(src.info.format) != BytesPerBlock(dst.info.format)) { if (BytesPerBlock(src.info.format) != BytesPerBlock(dst.info.format)) {
auto oneCopy = VideoCommon::ImageCopy{
.src_offset = VideoCommon::Offset3D(0, 0, 0), if (src.info.type == ImageType::Linear || dst.info.type == ImageType::Linear) {
.dst_offset = VideoCommon::Offset3D(0, 0, 0), return;
.extent = dst.info.size }
};
auto oneCopy = VideoCommon::ImageCopy{.src_offset = VideoCommon::Offset3D(0, 0, 0),
.dst_offset = VideoCommon::Offset3D(0, 0, 0),
.extent = dst.info.size};
return ReinterpretImage(dst, src, std::span{&oneCopy, 1}); return ReinterpretImage(dst, src, std::span{&oneCopy, 1});
} }
boost::container::small_vector<VkImageCopy, 16> vk_copies(copies.size()); boost::container::small_vector<VkImageCopy, 16> vk_copies(copies.size());
const VkImageAspectFlags aspect_mask = dst.AspectMask(); const VkImageAspectFlags aspect_mask = dst.AspectMask();
ASSERT(aspect_mask == src.AspectMask()); ASSERT(aspect_mask == src.AspectMask());