diff options
| author | lat9nq <lat9nq@gmail.com> | 2021-07-25 15:31:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 15:31:33 -0400 |
| commit | 09d6cc99435322c5f480eaa2b0967e33f4966ba6 (patch) | |
| tree | 72cdf06f6b7d77fdf5826104fea691f3ea450f54 /src/video_core/texture_cache/formatter.cpp | |
| parent | d8b00fd863c8aa9fca02a479ce958899f1aadf24 (diff) | |
| parent | 7e272d3cd81656b65b21f5a569fc9a2d76cac758 (diff) | |
Merge branch 'master' into fullscreen-enum
Diffstat (limited to 'src/video_core/texture_cache/formatter.cpp')
| -rw-r--r-- | src/video_core/texture_cache/formatter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/texture_cache/formatter.cpp b/src/video_core/texture_cache/formatter.cpp index d10ba4ccd..249cc4d0f 100644 --- a/src/video_core/texture_cache/formatter.cpp +++ b/src/video_core/texture_cache/formatter.cpp @@ -43,7 +43,7 @@ std::string Name(const ImageBase& image) { return "Invalid"; } -std::string Name(const ImageViewBase& image_view, std::optional<ImageViewType> type) { +std::string Name(const ImageViewBase& image_view) { const u32 width = image_view.size.width; const u32 height = image_view.size.height; const u32 depth = image_view.size.depth; @@ -51,7 +51,7 @@ std::string Name(const ImageViewBase& image_view, std::optional<ImageViewType> t const u32 num_layers = image_view.range.extent.layers; const std::string level = num_levels > 1 ? fmt::format(":{}", num_levels) : ""; - switch (type.value_or(image_view.type)) { + switch (image_view.type) { case ImageViewType::e1D: return fmt::format("ImageView 1D {}{}", width, level); case ImageViewType::e2D: |
