diff options
| author | 2017-02-08 22:07:34 -0800 | |
|---|---|---|
| committer | 2017-02-08 22:07:34 -0800 | |
| 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.gz yuzu-2889372e47624e368df0d0361cb38b8100f047dd.tar.xz yuzu-2889372e47624e368df0d0361cb38b8100f047dd.zip | |
Merge pull request #2482 from yuriks/pica-refactor
Split up monolithic Regs struct
Diffstat (limited to 'src/video_core/vertex_loader.h')
| -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 @@ | |||
| 2 | 2 | ||
| 3 | #include <array> | 3 | #include <array> |
| 4 | #include "common/common_types.h" | 4 | #include "common/common_types.h" |
| 5 | #include "video_core/pica.h" | 5 | #include "video_core/regs_pipeline.h" |
| 6 | 6 | ||
| 7 | namespace Pica { | 7 | namespace Pica { |
| 8 | 8 | ||
| @@ -17,11 +17,11 @@ struct AttributeBuffer; | |||
| 17 | class VertexLoader { | 17 | class VertexLoader { |
| 18 | public: | 18 | public: |
| 19 | VertexLoader() = default; | 19 | VertexLoader() = default; |
| 20 | explicit VertexLoader(const Pica::Regs& regs) { | 20 | explicit VertexLoader(const PipelineRegs& regs) { |
| 21 | Setup(regs); | 21 | Setup(regs); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | void Setup(const Pica::Regs& regs); | 24 | void Setup(const PipelineRegs& regs); |
| 25 | void LoadVertex(u32 base_address, int index, int vertex, Shader::AttributeBuffer& input, | 25 | void LoadVertex(u32 base_address, int index, int vertex, Shader::AttributeBuffer& input, |
| 26 | DebugUtils::MemoryAccessTracker& memory_accesses); | 26 | DebugUtils::MemoryAccessTracker& memory_accesses); |
| 27 | 27 | ||
| @@ -32,7 +32,7 @@ public: | |||
| 32 | private: | 32 | private: |
| 33 | std::array<u32, 16> vertex_attribute_sources; | 33 | std::array<u32, 16> vertex_attribute_sources; |
| 34 | std::array<u32, 16> vertex_attribute_strides{}; | 34 | std::array<u32, 16> vertex_attribute_strides{}; |
| 35 | std::array<Regs::VertexAttributeFormat, 16> vertex_attribute_formats; | 35 | std::array<PipelineRegs::VertexAttributeFormat, 16> vertex_attribute_formats; |
| 36 | std::array<u32, 16> vertex_attribute_elements{}; | 36 | std::array<u32, 16> vertex_attribute_elements{}; |
| 37 | std::array<bool, 16> vertex_attribute_is_default; | 37 | std::array<bool, 16> vertex_attribute_is_default; |
| 38 | int num_total_attributes = 0; | 38 | int num_total_attributes = 0; |