diff options
| author | 2021-05-23 04:28:34 -0300 | |
|---|---|---|
| committer | 2021-07-22 21:51:30 -0400 | |
| commit | d621e96d0de212cc16897eadf71e8a1b2e1eb5dc (patch) | |
| tree | 8695f2f4dddf2564b63e4574d6616ccb0e79568c /src/video_core/texture_cache | |
| parent | spirv: Be aware of NAN unaware drivers (diff) | |
| download | yuzu-d621e96d0de212cc16897eadf71e8a1b2e1eb5dc.tar.gz yuzu-d621e96d0de212cc16897eadf71e8a1b2e1eb5dc.tar.xz yuzu-d621e96d0de212cc16897eadf71e8a1b2e1eb5dc.zip | |
shader: Initial OpenGL implementation
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/formatter.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/texture_cache/formatter.h | 3 |
2 files changed, 3 insertions, 4 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) { | |||
| 43 | return "Invalid"; | 43 | return "Invalid"; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | std::string Name(const ImageViewBase& image_view, std::optional<ImageViewType> type) { | 46 | std::string Name(const ImageViewBase& image_view) { |
| 47 | const u32 width = image_view.size.width; | 47 | const u32 width = image_view.size.width; |
| 48 | const u32 height = image_view.size.height; | 48 | const u32 height = image_view.size.height; |
| 49 | const u32 depth = image_view.size.depth; | 49 | const u32 depth = image_view.size.depth; |
| @@ -51,7 +51,7 @@ std::string Name(const ImageViewBase& image_view, std::optional<ImageViewType> t | |||
| 51 | const u32 num_layers = image_view.range.extent.layers; | 51 | const u32 num_layers = image_view.range.extent.layers; |
| 52 | 52 | ||
| 53 | const std::string level = num_levels > 1 ? fmt::format(":{}", num_levels) : ""; | 53 | const std::string level = num_levels > 1 ? fmt::format(":{}", num_levels) : ""; |
| 54 | switch (type.value_or(image_view.type)) { | 54 | switch (image_view.type) { |
| 55 | case ImageViewType::e1D: | 55 | case ImageViewType::e1D: |
| 56 | return fmt::format("ImageView 1D {}{}", width, level); | 56 | return fmt::format("ImageView 1D {}{}", width, level); |
| 57 | case ImageViewType::e2D: | 57 | case ImageViewType::e2D: |
diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h index a48413983..c6cf0583f 100644 --- a/src/video_core/texture_cache/formatter.h +++ b/src/video_core/texture_cache/formatter.h | |||
| @@ -255,8 +255,7 @@ struct RenderTargets; | |||
| 255 | 255 | ||
| 256 | [[nodiscard]] std::string Name(const ImageBase& image); | 256 | [[nodiscard]] std::string Name(const ImageBase& image); |
| 257 | 257 | ||
| 258 | [[nodiscard]] std::string Name(const ImageViewBase& image_view, | 258 | [[nodiscard]] std::string Name(const ImageViewBase& image_view); |
| 259 | std::optional<ImageViewType> type = std::nullopt); | ||
| 260 | 259 | ||
| 261 | [[nodiscard]] std::string Name(const RenderTargets& render_targets); | 260 | [[nodiscard]] std::string Name(const RenderTargets& render_targets); |
| 262 | 261 | ||