summaryrefslogtreecommitdiffstats
path: root/src/video_core/primitive_assembly.h
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-02-09 07:07:34 +0100
committerGitHub <noreply@github.com>2017-02-09 07:07:34 +0100
commit2889372e47624e368df0d0361cb38b8100f047dd (patch)
tree183cd1cd6edb60ab566bd1fe181b712643bef30c /src/video_core/primitive_assembly.h
parentMerge pull request #2539 from Kloen/re-killing-warnings (diff)
parentVideoCore: Move Regs to its own file (diff)
downloadyuzu-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.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/video_core/primitive_assembly.h b/src/video_core/primitive_assembly.h
index 24da47382..e8eccdf27 100644
--- a/src/video_core/primitive_assembly.h
+++ b/src/video_core/primitive_assembly.h
@@ -5,7 +5,7 @@
#pragma once
#include <functional>
-#include "video_core/pica.h"
+#include "video_core/regs_pipeline.h"
namespace Pica {
@@ -18,7 +18,8 @@ struct PrimitiveAssembler {
using TriangleHandler =
std::function<void(const VertexType& v0, const VertexType& v1, const VertexType& v2)>;
- PrimitiveAssembler(Regs::TriangleTopology topology = Regs::TriangleTopology::List);
+ PrimitiveAssembler(
+ PipelineRegs::TriangleTopology topology = PipelineRegs::TriangleTopology::List);
/*
* Queues a vertex, builds primitives from the vertex queue according to the given
@@ -36,10 +37,10 @@ struct PrimitiveAssembler {
/**
* Reconfigures the PrimitiveAssembler to use a different triangle topology.
*/
- void Reconfigure(Regs::TriangleTopology topology);
+ void Reconfigure(PipelineRegs::TriangleTopology topology);
private:
- Regs::TriangleTopology topology;
+ PipelineRegs::TriangleTopology topology;
int buffer_index;
VertexType buffer[2];