OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 08:30:07 +00:00
Code Issues Projects Releases Wiki Activity

vk_texture_runtime: Add MSAA support to ClearTextureWithRenderpass

Browse Source
This commit is contained in:
Wunkolo 2023-11-13 13:28:26 -08:00
parent 4e8db844f2
commit 7388e4e32d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,7 +384,7 @@ void TextureRuntime::ClearTextureWithRenderpass(Surface& surface,
.aspect = surface.Aspect(), .aspect = surface.Aspect(),
.pipeline_flags = surface.PipelineStageFlags(), .pipeline_flags = surface.PipelineStageFlags(),
.src_access = surface.AccessFlags(), .src_access = surface.AccessFlags(),
.src_image = surface.Image(), .src_image = surface.GetSampleCount() > 1 ? surface.Image(3) : surface.Image(),
}; };
scheduler.Record([params, is_color, clear, render_pass, scheduler.Record([params, is_color, clear, render_pass,
@ -1342,7 +1342,7 @@ vk::ImageView Surface::StorageView() noexcept {
is_storage = true; is_storage = true;
const vk::ImageViewCreateInfo storage_view_info = { const vk::ImageViewCreateInfo storage_view_info = {
.image = Image(), .image = sample_count > 1 ? Image(3) : Image(),
.viewType = vk::ImageViewType::e2D, .viewType = vk::ImageViewType::e2D,
.format = vk::Format::eR32Uint, .format = vk::Format::eR32Uint,
.subresourceRange{ .subresourceRange{
@ -1483,8 +1483,8 @@ void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) {
Framebuffer::Framebuffer(TextureRuntime& runtime, const VideoCore::FramebufferParams& params, Framebuffer::Framebuffer(TextureRuntime& runtime, const VideoCore::FramebufferParams& params,
Surface* color, Surface* depth) Surface* color, Surface* depth)
: VideoCore::FramebufferParams{params}, : VideoCore::FramebufferParams{params}, res_scale{color ? color->res_scale
res_scale{color ? color->res_scale : (depth ? depth->res_scale : 1u)}, : (depth ? depth->res_scale : 1u)},
sample_count{params.sample_count} { sample_count{params.sample_count} {
auto& renderpass_cache = runtime.GetRenderpassCache(); auto& renderpass_cache = runtime.GetRenderpassCache();
if (shadow_rendering && !color) { if (shadow_rendering && !color) {
@ -1588,8 +1588,8 @@ Sampler::Sampler(TextureRuntime& runtime, const VideoCore::SamplerParams& params
Sampler::~Sampler() = default; Sampler::~Sampler() = default;
DebugScope::DebugScope(TextureRuntime& runtime, Common::Vec4f color, std::string_view label) DebugScope::DebugScope(TextureRuntime& runtime, Common::Vec4f color, std::string_view label)
: scheduler{runtime.GetScheduler()}, has_debug_tool{ : scheduler{runtime.GetScheduler()},
runtime.GetInstance().HasDebuggingToolAttached()} { has_debug_tool{runtime.GetInstance().HasDebuggingToolAttached()} {
if (!has_debug_tool) { if (!has_debug_tool) {
return; return;
} }