From 783dc9e112cec88033410eced44a3da81472cc11 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 9 Feb 2021 17:30:18 -0500 Subject: [PATCH 1/2] texture_cache/util: Remove unused functions Silences a few warnings on clang 12. --- src/video_core/texture_cache/util.cpp | 34 --------------------------- 1 file changed, 34 deletions(-) diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index bb2cdef81e..a0bc1f7b69 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -169,40 +169,6 @@ template return Common::DivCeil(AdjustMipSize(size, level), block_size); } -[[nodiscard]] constexpr u32 LayerSize(const TICEntry& config, PixelFormat format) { - return config.Width() * config.Height() * BytesPerBlock(format); -} - -[[nodiscard]] constexpr bool HasTwoDimsPerLayer(TextureType type) { - switch (type) { - case TextureType::Texture2D: - case TextureType::Texture2DArray: - case TextureType::Texture2DNoMipmap: - case TextureType::Texture3D: - case TextureType::TextureCubeArray: - case TextureType::TextureCubemap: - return true; - case TextureType::Texture1D: - case TextureType::Texture1DArray: - case TextureType::Texture1DBuffer: - return false; - } - return false; -} - -[[nodiscard]] constexpr bool HasTwoDimsPerLayer(ImageType type) { - switch (type) { - case ImageType::e2D: - case ImageType::e3D: - case ImageType::Linear: - return true; - case ImageType::e1D: - case ImageType::Buffer: - return false; - } - UNREACHABLE_MSG("Invalid image type={}", static_cast(type)); -} - [[nodiscard]] constexpr std::pair Samples(int num_samples) { switch (num_samples) { case 1: From 10636d2494bec08d4171c4845a6da1bca9e832ba Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 9 Feb 2021 17:31:35 -0500 Subject: [PATCH 2/2] gl_rasterizer: Remove unused variables Resolves warnings on clang 12 --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 8aa63d3291..ea4ca9a82e 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -67,9 +67,6 @@ constexpr size_t TOTAL_CONST_BUFFER_BYTES = constexpr size_t NUM_SUPPORTED_VERTEX_ATTRIBUTES = 16; constexpr size_t NUM_SUPPORTED_VERTEX_BINDINGS = 16; -constexpr size_t MAX_TEXTURES = 192; -constexpr size_t MAX_IMAGES = 48; - struct TextureHandle { constexpr TextureHandle(u32 data, bool via_header_index) { const Tegra::Texture::TextureHandle handle{data};