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/primitive_assembly.cpp | |
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/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 @@ // Refer to the license.txt file included. #include "common/logging/log.h" -#include "video_core/pica.h" #include "video_core/primitive_assembly.h" +#include "video_core/regs_pipeline.h" #include "video_core/shader/shader.h" namespace Pica { template <typename VertexType> -PrimitiveAssembler<VertexType>::PrimitiveAssembler(Regs::TriangleTopology topology) +PrimitiveAssembler<VertexType>::PrimitiveAssembler(PipelineRegs::TriangleTopology topology) : topology(topology), buffer_index(0) {} template <typename VertexType> @@ -18,8 +18,8 @@ void PrimitiveAssembler<VertexType>::SubmitVertex(const VertexType& vtx, TriangleHandler triangle_handler) { switch (topology) { // TODO: Figure out what's different with TriangleTopology::Shader. - case Regs::TriangleTopology::List: - case Regs::TriangleTopology::Shader: + case PipelineRegs::TriangleTopology::List: + case PipelineRegs::TriangleTopology::Shader: if (buffer_index < 2) { buffer[buffer_index++] = vtx; } else { @@ -29,8 +29,8 @@ void PrimitiveAssembler<VertexType>::SubmitVertex(const VertexType& vtx, } break; - case Regs::TriangleTopology::Strip: - case Regs::TriangleTopology::Fan: + case PipelineRegs::TriangleTopology::Strip: + case PipelineRegs::TriangleTopology::Fan: if (strip_ready) triangle_handler(buffer[0], buffer[1], vtx); @@ -38,9 +38,9 @@ void PrimitiveAssembler<VertexType>::SubmitVertex(const VertexType& vtx, strip_ready |= (buffer_index == 1); - if (topology == Regs::TriangleTopology::Strip) + if (topology == PipelineRegs::TriangleTopology::Strip) buffer_index = !buffer_index; - else if (topology == Regs::TriangleTopology::Fan) + else if (topology == PipelineRegs::TriangleTopology::Fan) buffer_index = 1; break; @@ -57,7 +57,7 @@ void PrimitiveAssembler<VertexType>::Reset() { } template <typename VertexType> -void PrimitiveAssembler<VertexType>::Reconfigure(Regs::TriangleTopology topology) { +void PrimitiveAssembler<VertexType>::Reconfigure(PipelineRegs::TriangleTopology topology) { Reset(); this->topology = topology; } |