rasterizer_cache: Create Surface MSAA handles upon ScaleUp

src/video_core/rasterizer_cache/rasterizer_cache.h

@@ -431,8 +431,10 @@ void RasterizerCache<T>::CopySurface(Surface& src_surface, Surface& dst_surface,
 
     const u32 src_scale = src_surface.res_scale;
     const u32 dst_scale = dst_surface.res_scale;
-    if (src_scale > dst_scale) {
+    const u32 src_sample_count = src_surface.sample_count;
-        dst_surface.ScaleUp(src_scale);
+    const u32 dst_sample_count = dst_surface.sample_count;
+    if ((src_scale > dst_scale) || (src_sample_count > dst_sample_count)) {
+        dst_surface.ScaleUp(src_scale, src_sample_count);
     }
 
     const auto src_rect = src_surface.GetScaledSubRect(subrect_params);
@@ -1171,8 +1173,9 @@ bool RasterizerCache<T>::ValidateByReinterpretation(Surface& surface, SurfacePar
             return false;
         }
         const u32 res_scale = src_surface.res_scale;
-        if (res_scale > surface.res_scale) {
+        const u8 sample_count = src_surface.sample_count;
-            surface.ScaleUp(res_scale);
+        if ((res_scale > surface.res_scale) || (sample_count > surface.sample_count)) {
+            surface.ScaleUp(res_scale, sample_count);
         }
         const PAddr addr = boost::icl::lower(interval);
         const SurfaceParams copy_params = surface.FromInterval(copy_interval);
@@ -1349,8 +1352,8 @@ SurfaceId RasterizerCache<T>::CreateSurface(const SurfaceParams& params) {
         return surface_id;
     }();
     Surface& surface = slot_surfaces[surface_id];
-    if (params.res_scale > surface.res_scale) {
+    if ((params.res_scale > surface.res_scale) || (params.sample_count > surface.sample_count)) {
-        surface.ScaleUp(params.res_scale);
+        surface.ScaleUp(params.res_scale, params.sample_count);
     }
     surface.MarkInvalid(surface.GetInterval());
     return surface_id;

src/video_core/renderer_opengl/gl_texture_runtime.cpp

@@ -550,15 +550,20 @@ void Surface::Attach(GLenum target, u32 level, u32 layer, bool scaled) {
     }
 }
 
-void Surface::ScaleUp(u32 new_scale) {
+void Surface::ScaleUp(u32 new_scale, u8 new_sample_count) {
-    if (res_scale == new_scale || new_scale == 1) {
+    if (res_scale == new_scale) {
+        return;
+    }
+    if (sample_count == new_sample_count) {
         return;
     }
 
     res_scale = new_scale;
+
+    if (res_scale > 1) {
+
         textures[1] = MakeHandle(GL_TEXTURE_2D, GetScaledWidth(), GetScaledHeight(), levels, tuple,
                                  DebugName(true));
-
         for (u32 level = 0; level < levels; level++) {
             const VideoCore::TextureBlit blit = {
                 .src_level = level,
@@ -570,6 +575,11 @@ void Surface::ScaleUp(u32 new_scale) {
         }
     }
 
+    if (new_sample_count > 1) {
+        // Todo(wunk): OpenGL MSAA
+    }
+}
+
 u32 Surface::GetInternalBytesPerPixel() const {
     // RGB8 is converted to RGBA8 on OpenGL ES since it doesn't support BGR8
     if (driver->IsOpenGLES() && pixel_format == VideoCore::PixelFormat::RGB8) {

src/video_core/renderer_opengl/gl_texture_runtime.h

@@ -126,8 +126,8 @@ public:
     /// Attaches a handle of surface to the specified framebuffer target
     void Attach(GLenum target, u32 level, u32 layer, bool scaled = true);
 
-    /// Scales up the surface to match the new resolution scale.
+    /// Scales up the surface to match the new resolution scale and sample-count.
-    void ScaleUp(u32 new_scale);
+    void ScaleUp(u32 new_scale, u8 new_sample_count);
 
     /// Returns the bpp of the internal surface format
     u32 GetInternalBytesPerPixel() const;

src/video_core/renderer_vulkan/vk_texture_runtime.cpp

@@ -1084,12 +1084,16 @@ void Surface::Download(const VideoCore::BufferTextureCopy& download,
         });
 }
 
-void Surface::ScaleUp(u32 new_scale) {
+void Surface::ScaleUp(u32 new_scale, u8 new_sample_count) {
-    if (res_scale == new_scale || new_scale == 1) {
+    if (res_scale == new_scale) {
+        return;
+    }
+    if (sample_count == new_sample_count) {
         return;
     }
 
     res_scale = new_scale;
+    sample_count = new_sample_count;
 
     const bool is_mutable = pixel_format == VideoCore::PixelFormat::RGBA8;
 
@@ -1101,6 +1105,7 @@ void Surface::ScaleUp(u32 new_scale) {
         flags |= vk::ImageCreateFlagBits::eMutableFormat;
     }
 
+    if (res_scale > 1) {
         handles[1] = MakeHandle(instance, GetScaledWidth(), GetScaledHeight(), levels, texture_type,
                                 traits.native, vk::SampleCountFlagBits::e1, traits.usage, flags,
                                 traits.aspect, false, DebugName(true));
@@ -1125,6 +1130,13 @@ void Surface::ScaleUp(u32 new_scale) {
         }
     }
 
+    if (sample_count > 1) {
+        handles[3] = MakeHandle(instance, GetScaledWidth(), GetScaledHeight(), levels, texture_type,
+                                traits.native, vk::SampleCountFlagBits(sample_count), traits.usage,
+                                flags, traits.aspect, false, DebugName(true, false, sample_count));
+    }
+}
+
 u32 Surface::GetInternalBytesPerPixel() const {
     // Request 5 bytes for D24S8 as well because we can use the
     // extra space when deinterleaving the data during upload
@@ -1487,8 +1499,8 @@ void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) {
 
 Framebuffer::Framebuffer(TextureRuntime& runtime, const VideoCore::FramebufferParams& params,
                          Surface* color, Surface* depth)
-    : VideoCore::FramebufferParams{params}, res_scale{color ? color->res_scale
+    : VideoCore::FramebufferParams{params},
-                                                            : (depth ? depth->res_scale : 1u)},
+      res_scale{color ? color->res_scale : (depth ? depth->res_scale : 1u)},
       sample_count{params.sample_count} {
     auto& renderpass_cache = runtime.GetRenderpassCache();
     if (shadow_rendering && !color) {

src/video_core/renderer_vulkan/vk_texture_runtime.h

@@ -156,8 +156,8 @@ public:
     void Download(const VideoCore::BufferTextureCopy& download,
                   const VideoCore::StagingData& staging);
 
-    /// Scales up the surface to match the new resolution scale.
+    /// Scales up the surface to match the new resolution scale and sample-count.
-    void ScaleUp(u32 new_scale);
+    void ScaleUp(u32 new_scale, u8 new_sample_count);
 
     /// Returns the bpp of the internal surface format
     u32 GetInternalBytesPerPixel() const;