diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-02-09 07:07:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-09 07:07:34 +0100 |
commit | 2889372e47624e368df0d0361cb38b8100f047dd (patch) | |
tree | 183cd1cd6edb60ab566bd1fe181b712643bef30c /src/video_core/vertex_loader.h | |
parent | Merge pull request #2539 from Kloen/re-killing-warnings (diff) | |
parent | VideoCore: Move Regs to its own file (diff) | |
download | yuzu-2889372e47624e368df0d0361cb38b8100f047dd.tar yuzu-2889372e47624e368df0d0361cb38b8100f047dd.tar.gz yuzu-2889372e47624e368df0d0361cb38b8100f047dd.tar.bz2 yuzu-2889372e47624e368df0d0361cb38b8100f047dd.tar.lz yuzu-2889372e47624e368df0d0361cb38b8100f047dd.tar.xz yuzu-2889372e47624e368df0d0361cb38b8100f047dd.tar.zst yuzu-2889372e47624e368df0d0361cb38b8100f047dd.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/vertex_loader.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/vertex_loader.h b/src/video_core/vertex_loader.h index 51f3d45b4..02db10aee 100644 --- a/src/video_core/vertex_loader.h +++ b/src/video_core/vertex_loader.h @@ -2,7 +2,7 @@ #include <array> #include "common/common_types.h" -#include "video_core/pica.h" +#include "video_core/regs_pipeline.h" namespace Pica { @@ -17,11 +17,11 @@ struct AttributeBuffer; class VertexLoader { public: VertexLoader() = default; - explicit VertexLoader(const Pica::Regs& regs) { + explicit VertexLoader(const PipelineRegs& regs) { Setup(regs); } - void Setup(const Pica::Regs& regs); + void Setup(const PipelineRegs& regs); void LoadVertex(u32 base_address, int index, int vertex, Shader::AttributeBuffer& input, DebugUtils::MemoryAccessTracker& memory_accesses); @@ -32,7 +32,7 @@ public: private: std::array<u32, 16> vertex_attribute_sources; std::array<u32, 16> vertex_attribute_strides{}; - std::array<Regs::VertexAttributeFormat, 16> vertex_attribute_formats; + std::array<PipelineRegs::VertexAttributeFormat, 16> vertex_attribute_formats; std::array<u32, 16> vertex_attribute_elements{}; std::array<bool, 16> vertex_attribute_is_default; int num_total_attributes = 0; |