diff options
| author | 2017-01-27 18:10:54 -0800 | |
|---|---|---|
| committer | 2017-01-29 21:31:38 -0800 | |
| commit | 37a4ea046d80973d59ddb7735a0ffbf0bfd93ad0 (patch) | |
| tree | ea34825c27519d42b6f9ec82cdccafb49815a89b /src | |
| parent | VideoCore: Extract swrast-specific data from OutputVertex (diff) | |
| download | yuzu-37a4ea046d80973d59ddb7735a0ffbf0bfd93ad0.tar.gz yuzu-37a4ea046d80973d59ddb7735a0ffbf0bfd93ad0.tar.xz yuzu-37a4ea046d80973d59ddb7735a0ffbf0bfd93ad0.zip | |
VideoCore: Make PrimitiveAssembler const-correct
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/primitive_assembly.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/primitive_assembly.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp index be7377290..e71ff5719 100644 --- a/src/video_core/primitive_assembly.cpp +++ b/src/video_core/primitive_assembly.cpp | |||
| @@ -14,7 +14,7 @@ PrimitiveAssembler<VertexType>::PrimitiveAssembler(Regs::TriangleTopology topolo | |||
| 14 | : topology(topology), buffer_index(0) {} | 14 | : topology(topology), buffer_index(0) {} |
| 15 | 15 | ||
| 16 | template <typename VertexType> | 16 | template <typename VertexType> |
| 17 | void PrimitiveAssembler<VertexType>::SubmitVertex(VertexType& vtx, | 17 | void PrimitiveAssembler<VertexType>::SubmitVertex(const VertexType& vtx, |
| 18 | TriangleHandler triangle_handler) { | 18 | TriangleHandler triangle_handler) { |
| 19 | switch (topology) { | 19 | switch (topology) { |
| 20 | // TODO: Figure out what's different with TriangleTopology::Shader. | 20 | // TODO: Figure out what's different with TriangleTopology::Shader. |
diff --git a/src/video_core/primitive_assembly.h b/src/video_core/primitive_assembly.h index 0384d5984..24da47382 100644 --- a/src/video_core/primitive_assembly.h +++ b/src/video_core/primitive_assembly.h | |||
| @@ -15,7 +15,8 @@ namespace Pica { | |||
| 15 | */ | 15 | */ |
| 16 | template <typename VertexType> | 16 | template <typename VertexType> |
| 17 | struct PrimitiveAssembler { | 17 | struct PrimitiveAssembler { |
| 18 | using TriangleHandler = std::function<void(VertexType& v0, VertexType& v1, VertexType& v2)>; | 18 | using TriangleHandler = |
| 19 | std::function<void(const VertexType& v0, const VertexType& v1, const VertexType& v2)>; | ||
| 19 | 20 | ||
| 20 | PrimitiveAssembler(Regs::TriangleTopology topology = Regs::TriangleTopology::List); | 21 | PrimitiveAssembler(Regs::TriangleTopology topology = Regs::TriangleTopology::List); |
| 21 | 22 | ||
| @@ -25,7 +26,7 @@ struct PrimitiveAssembler { | |||
| 25 | * NOTE: We could specify the triangle handler in the constructor, but this way we can | 26 | * NOTE: We could specify the triangle handler in the constructor, but this way we can |
| 26 | * keep event and handler code next to each other. | 27 | * keep event and handler code next to each other. |
| 27 | */ | 28 | */ |
| 28 | void SubmitVertex(VertexType& vtx, TriangleHandler triangle_handler); | 29 | void SubmitVertex(const VertexType& vtx, TriangleHandler triangle_handler); |
| 29 | 30 | ||
| 30 | /** | 31 | /** |
| 31 | * Resets the internal state of the PrimitiveAssembler. | 32 | * Resets the internal state of the PrimitiveAssembler. |