diff options
author | Fernando S <fsahmkow27@gmail.com> | 2023-04-24 12:36:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-24 12:36:24 +0200 |
commit | 2311fa7c840d514bb39786208ff50b0018db71ff (patch) | |
tree | 0c6d424ceb552290766b523f1bfed4cf3ff421c1 | |
parent | Merge pull request #10074 from Kelebek1/fermi_blit (diff) | |
parent | maxwell_3d: fix out of bounds array access in size estimation (diff) | |
download | yuzu-2311fa7c840d514bb39786208ff50b0018db71ff.tar yuzu-2311fa7c840d514bb39786208ff50b0018db71ff.tar.gz yuzu-2311fa7c840d514bb39786208ff50b0018db71ff.tar.bz2 yuzu-2311fa7c840d514bb39786208ff50b0018db71ff.tar.lz yuzu-2311fa7c840d514bb39786208ff50b0018db71ff.tar.xz yuzu-2311fa7c840d514bb39786208ff50b0018db71ff.tar.zst yuzu-2311fa7c840d514bb39786208ff50b0018db71ff.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 614d61db4..0932fadc2 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -4,6 +4,7 @@ #include <cstring> #include <optional> #include "common/assert.h" +#include "common/bit_util.h" #include "common/scope_exit.h" #include "common/settings.h" #include "core/core.h" @@ -259,12 +260,13 @@ u32 Maxwell3D::GetMaxCurrentVertices() { size_t Maxwell3D::EstimateIndexBufferSize() { GPUVAddr start_address = regs.index_buffer.StartAddress(); GPUVAddr end_address = regs.index_buffer.EndAddress(); - static constexpr std::array<size_t, 4> max_sizes = { - std::numeric_limits<u8>::max(), std::numeric_limits<u16>::max(), - std::numeric_limits<u32>::max(), std::numeric_limits<u32>::max()}; + static constexpr std::array<size_t, 3> max_sizes = {std::numeric_limits<u8>::max(), + std::numeric_limits<u16>::max(), + std::numeric_limits<u32>::max()}; const size_t byte_size = regs.index_buffer.FormatSizeInBytes(); + const size_t log2_byte_size = Common::Log2Ceil64(byte_size); return std::min<size_t>( - memory_manager.GetMemoryLayoutSize(start_address, byte_size * max_sizes[byte_size]) / + memory_manager.GetMemoryLayoutSize(start_address, byte_size * max_sizes[log2_byte_size]) / byte_size, static_cast<size_t>(end_address - start_address)); } |