diff options
| author |  Lioncash | 2016-04-29 11:06:03 -0400 |
|---|---|---|
| committer | Lioncash | 2016-05-08 23:03:32 -0400 |
| commit | 8ea5e7dfb57ebda2ad2229e4e94dfd5e2c24c091 (patch) | |
| tree | 3d95240c734eba4080dcc98334609600b9b8af1e | |
| parent | vertex_loader: Correct header ordering (diff) | |
| download | yuzu-8ea5e7dfb57ebda2ad2229e4e94dfd5e2c24c091.tar.gz yuzu-8ea5e7dfb57ebda2ad2229e4e94dfd5e2c24c091.tar.xz yuzu-8ea5e7dfb57ebda2ad2229e4e94dfd5e2c24c091.zip | |
vertex_loader: Use std::array instead of raw C arrays
| -rw-r--r-- | src/video_core/vertex_loader.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/video_core/vertex_loader.h b/src/video_core/vertex_loader.h index becf5a403..3b511945a 100644 --- a/src/video_core/vertex_loader.h +++ b/src/video_core/vertex_loader.h | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | #include "common/common_types.h" | 3 | #include <array> |
| 4 | 4 | ||
| 5 | #include "common/common_types.h" | ||
| 5 | #include "video_core/pica.h" | 6 | #include "video_core/pica.h" |
| 6 | 7 | ||
| 7 | namespace Pica { | 8 | namespace Pica { |
| @@ -22,11 +23,11 @@ public: | |||
| 22 | int GetNumTotalAttributes() const { return num_total_attributes; } | 23 | int GetNumTotalAttributes() const { return num_total_attributes; } |
| 23 | 24 | ||
| 24 | private: | 25 | private: |
| 25 | u32 vertex_attribute_sources[16]; | 26 | std::array<u32, 16> vertex_attribute_sources; |
| 26 | u32 vertex_attribute_strides[16] = {}; | 27 | std::array<u32, 16> vertex_attribute_strides{}; |
| 27 | Regs::VertexAttributeFormat vertex_attribute_formats[16] = {}; | 28 | std::array<Regs::VertexAttributeFormat, 16> vertex_attribute_formats; |
| 28 | u32 vertex_attribute_elements[16] = {}; | 29 | std::array<u32, 16> vertex_attribute_elements{}; |
| 29 | bool vertex_attribute_is_default[16]; | 30 | std::array<bool, 16> vertex_attribute_is_default; |
| 30 | int num_total_attributes; | 31 | int num_total_attributes; |
| 31 | }; | 32 | }; |
| 32 | 33 | ||