diff options
Diffstat (limited to 'src/video_core/primitive_assembly.cpp')
| -rw-r--r-- | src/video_core/primitive_assembly.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp index e71ff5719..acd2ac5e2 100644 --- a/src/video_core/primitive_assembly.cpp +++ b/src/video_core/primitive_assembly.cpp | |||
| @@ -3,14 +3,14 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/logging/log.h" | 5 | #include "common/logging/log.h" |
| 6 | #include "video_core/pica.h" | ||
| 7 | #include "video_core/primitive_assembly.h" | 6 | #include "video_core/primitive_assembly.h" |
| 7 | #include "video_core/regs_pipeline.h" | ||
| 8 | #include "video_core/shader/shader.h" | 8 | #include "video_core/shader/shader.h" |
| 9 | 9 | ||
| 10 | namespace Pica { | 10 | namespace Pica { |
| 11 | 11 | ||
| 12 | template <typename VertexType> | 12 | template <typename VertexType> |
| 13 | PrimitiveAssembler<VertexType>::PrimitiveAssembler(Regs::TriangleTopology topology) | 13 | PrimitiveAssembler<VertexType>::PrimitiveAssembler(PipelineRegs::TriangleTopology topology) |
| 14 | : topology(topology), buffer_index(0) {} | 14 | : topology(topology), buffer_index(0) {} |
| 15 | 15 | ||
| 16 | template <typename VertexType> | 16 | template <typename VertexType> |
| @@ -18,8 +18,8 @@ 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. |
| 21 | case Regs::TriangleTopology::List: | 21 | case PipelineRegs::TriangleTopology::List: |
| 22 | case Regs::TriangleTopology::Shader: | 22 | case PipelineRegs::TriangleTopology::Shader: |
| 23 | if (buffer_index < 2) { | 23 | if (buffer_index < 2) { |
| 24 | buffer[buffer_index++] = vtx; | 24 | buffer[buffer_index++] = vtx; |
| 25 | } else { | 25 | } else { |
| @@ -29,8 +29,8 @@ void PrimitiveAssembler<VertexType>::SubmitVertex(const VertexType& vtx, | |||
| 29 | } | 29 | } |
| 30 | break; | 30 | break; |
| 31 | 31 | ||
| 32 | case Regs::TriangleTopology::Strip: | 32 | case PipelineRegs::TriangleTopology::Strip: |
| 33 | case Regs::TriangleTopology::Fan: | 33 | case PipelineRegs::TriangleTopology::Fan: |
| 34 | if (strip_ready) | 34 | if (strip_ready) |
| 35 | triangle_handler(buffer[0], buffer[1], vtx); | 35 | triangle_handler(buffer[0], buffer[1], vtx); |
| 36 | 36 | ||
| @@ -38,9 +38,9 @@ void PrimitiveAssembler<VertexType>::SubmitVertex(const VertexType& vtx, | |||
| 38 | 38 | ||
| 39 | strip_ready |= (buffer_index == 1); | 39 | strip_ready |= (buffer_index == 1); |
| 40 | 40 | ||
| 41 | if (topology == Regs::TriangleTopology::Strip) | 41 | if (topology == PipelineRegs::TriangleTopology::Strip) |
| 42 | buffer_index = !buffer_index; | 42 | buffer_index = !buffer_index; |
| 43 | else if (topology == Regs::TriangleTopology::Fan) | 43 | else if (topology == PipelineRegs::TriangleTopology::Fan) |
| 44 | buffer_index = 1; | 44 | buffer_index = 1; |
| 45 | break; | 45 | break; |
| 46 | 46 | ||
| @@ -57,7 +57,7 @@ void PrimitiveAssembler<VertexType>::Reset() { | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | template <typename VertexType> | 59 | template <typename VertexType> |
| 60 | void PrimitiveAssembler<VertexType>::Reconfigure(Regs::TriangleTopology topology) { | 60 | void PrimitiveAssembler<VertexType>::Reconfigure(PipelineRegs::TriangleTopology topology) { |
| 61 | Reset(); | 61 | Reset(); |
| 62 | this->topology = topology; | 62 | this->topology = topology; |
| 63 | } | 63 | } |