diff options
| author | 2021-02-09 15:29:10 -0800 | |
|---|---|---|
| committer | 2021-02-09 15:29:10 -0800 | |
| commit | 245d60bfffdc00f1474053540a7f776612d427e6 (patch) | |
| tree | 8e8beeaf96fe93357dd89d45de5d941b86565ef0 | |
| parent | Settings: Add depth to Joysticks on Pro Controller preview (#5894) (diff) | |
| parent | gl_rasterizer: Remove unused variables (diff) | |
| download | yuzu-245d60bfffdc00f1474053540a7f776612d427e6.tar.gz yuzu-245d60bfffdc00f1474053540a7f776612d427e6.tar.xz yuzu-245d60bfffdc00f1474053540a7f776612d427e6.zip | |
Merge pull request #5900 from lioncash/unused-func
video_core: Remove unused functions and variables
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/texture_cache/util.cpp | 34 |
2 files changed, 0 insertions, 37 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 8aa63d329..ea4ca9a82 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 = | |||
| 67 | constexpr size_t NUM_SUPPORTED_VERTEX_ATTRIBUTES = 16; | 67 | constexpr size_t NUM_SUPPORTED_VERTEX_ATTRIBUTES = 16; |
| 68 | constexpr size_t NUM_SUPPORTED_VERTEX_BINDINGS = 16; | 68 | constexpr size_t NUM_SUPPORTED_VERTEX_BINDINGS = 16; |
| 69 | 69 | ||
| 70 | constexpr size_t MAX_TEXTURES = 192; | ||
| 71 | constexpr size_t MAX_IMAGES = 48; | ||
| 72 | |||
| 73 | struct TextureHandle { | 70 | struct TextureHandle { |
| 74 | constexpr TextureHandle(u32 data, bool via_header_index) { | 71 | constexpr TextureHandle(u32 data, bool via_header_index) { |
| 75 | const Tegra::Texture::TextureHandle handle{data}; | 72 | const Tegra::Texture::TextureHandle handle{data}; |
diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index bb2cdef81..a0bc1f7b6 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp | |||
| @@ -169,40 +169,6 @@ template <u32 GOB_EXTENT> | |||
| 169 | return Common::DivCeil(AdjustMipSize(size, level), block_size); | 169 | return Common::DivCeil(AdjustMipSize(size, level), block_size); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | [[nodiscard]] constexpr u32 LayerSize(const TICEntry& config, PixelFormat format) { | ||
| 173 | return config.Width() * config.Height() * BytesPerBlock(format); | ||
| 174 | } | ||
| 175 | |||
| 176 | [[nodiscard]] constexpr bool HasTwoDimsPerLayer(TextureType type) { | ||
| 177 | switch (type) { | ||
| 178 | case TextureType::Texture2D: | ||
| 179 | case TextureType::Texture2DArray: | ||
| 180 | case TextureType::Texture2DNoMipmap: | ||
| 181 | case TextureType::Texture3D: | ||
| 182 | case TextureType::TextureCubeArray: | ||
| 183 | case TextureType::TextureCubemap: | ||
| 184 | return true; | ||
| 185 | case TextureType::Texture1D: | ||
| 186 | case TextureType::Texture1DArray: | ||
| 187 | case TextureType::Texture1DBuffer: | ||
| 188 | return false; | ||
| 189 | } | ||
| 190 | return false; | ||
| 191 | } | ||
| 192 | |||
| 193 | [[nodiscard]] constexpr bool HasTwoDimsPerLayer(ImageType type) { | ||
| 194 | switch (type) { | ||
| 195 | case ImageType::e2D: | ||
| 196 | case ImageType::e3D: | ||
| 197 | case ImageType::Linear: | ||
| 198 | return true; | ||
| 199 | case ImageType::e1D: | ||
| 200 | case ImageType::Buffer: | ||
| 201 | return false; | ||
| 202 | } | ||
| 203 | UNREACHABLE_MSG("Invalid image type={}", static_cast<int>(type)); | ||
| 204 | } | ||
| 205 | |||
| 206 | [[nodiscard]] constexpr std::pair<int, int> Samples(int num_samples) { | 172 | [[nodiscard]] constexpr std::pair<int, int> Samples(int num_samples) { |
| 207 | switch (num_samples) { | 173 | switch (num_samples) { |
| 208 | case 1: | 174 | case 1: |