diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2026-04-11 14:55:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-11 14:55:41 -0500 |
| commit | 33f62b0f9f36a3dfccc3ecfc13358899d0cc8036 (patch) | |
| tree | 270bf5e13f299486c05d1f681e96dc5b774cc1e7 /Source/Core/VideoCommon | |
| parent | 27e09633dee06f25d76b2e84048e80c57d6e6a87 (diff) | |
| parent | f6a67aa6e722350db3fc778e4f881cb60090faa1 (diff) | |
Merge pull request #14500 from Sintendo/span2
Replace `const std::vector&` arguments with `std::span`
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/VertexShaderManager.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexShaderManager.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index 973b944d98..6d69803827 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -161,7 +161,7 @@ bool VertexShaderManager::UseVertexDepthRange() // Syncs the shader constant buffers with xfmem // TODO: A cleaner way to control the matrices without making a mess in the parameters field -void VertexShaderManager::SetConstants(const std::vector<std::string>& textures, +void VertexShaderManager::SetConstants(std::span<const std::string> textures, XFStateManager& xf_state_manager) { if (constants.missing_color_hex != g_ActiveConfig.iMissingColorValue) diff --git a/Source/Core/VideoCommon/VertexShaderManager.h b/Source/Core/VideoCommon/VertexShaderManager.h index 9678aae58f..600ba3b10f 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.h +++ b/Source/Core/VideoCommon/VertexShaderManager.h @@ -4,10 +4,9 @@ #pragma once #include <array> +#include <span> #include <string> -#include <vector> -#include "Common/BitSet.h" #include "Common/CommonTypes.h" #include "Common/Matrix.h" #include "VideoCommon/ConstantManager.h" @@ -26,7 +25,7 @@ public: // constant management void SetProjectionMatrix(XFStateManager& xf_state_manager); - void SetConstants(const std::vector<std::string>& textures, XFStateManager& xf_state_manager); + void SetConstants(std::span<const std::string> textures, XFStateManager& xf_state_manager); // data: 3 floats representing the X, Y and Z vertex model coordinates and the posmatrix index. // out: 4 floats which will be initialized with the corresponding clip space coordinates |