Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-22 11:37:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "[vk, pipeline, texture_cache] Renamed MakeView parametter"

Browse source
This commit is contained in:
CamilleLaVey 2025-11-26 09:56:53 -04:00
parent 0bb092b0d9
commit e60e448b10
4 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/video_core/renderer_vulkan/pipeline_helper.h
View file

@ -1,6 +1,3 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later

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

@ -2269,7 +2269,7 @@ bool ImageView::IsRescaled() const noexcept {
return src_image.IsRescaled(); return src_image.IsRescaled();
} }
vk::ImageView ImageView::MakeView(VkFormat vk_format, VkImageAspectFlags view_aspect_mask) { vk::ImageView ImageView::MakeView(VkFormat vk_format, VkImageAspectFlags aspect_mask) {
return device->GetLogical().CreateImageView({ return device->GetLogical().CreateImageView({
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.pNext = nullptr, .pNext = nullptr,
@ -2283,7 +2283,7 @@ vk::ImageView ImageView::MakeView(VkFormat vk_format, VkImageAspectFlags view_as
.b = VK_COMPONENT_SWIZZLE_IDENTITY, .b = VK_COMPONENT_SWIZZLE_IDENTITY,
.a = VK_COMPONENT_SWIZZLE_IDENTITY, .a = VK_COMPONENT_SWIZZLE_IDENTITY,
}, },
.subresourceRange = MakeSubresourceRange(view_aspect_mask, range), .subresourceRange = MakeSubresourceRange(aspect_mask, range),
}); });
} }

5
src/video_core/renderer_vulkan/vk_texture_cache.h
View file

@ -1,6 +1,3 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
@ -276,7 +273,7 @@ private:
std::array<vk::ImageView, Shader::NUM_TEXTURE_TYPES> unsigneds; std::array<vk::ImageView, Shader::NUM_TEXTURE_TYPES> unsigneds;
}; };
[[nodiscard]] vk::ImageView MakeView(VkFormat vk_format, VkImageAspectFlags view_aspect_mask); [[nodiscard]] vk::ImageView MakeView(VkFormat vk_format, VkImageAspectFlags aspect_mask);
[[nodiscard]] vk::ImageView CreateSampledView(Shader::TextureType texture_type, [[nodiscard]] vk::ImageView CreateSampledView(Shader::TextureType texture_type,
VkFormat vk_format) const; VkFormat vk_format) const;

3
src/video_core/surface.h
View file

@ -1,6 +1,3 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2014 Citra Emulator Project // SPDX-FileCopyrightText: 2014 Citra Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later