From e38e79e27eff53e84a2c88c284c6cbdec5f74762 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 18 Apr 2020 20:39:04 -0400
Subject: [PATCH] primitive_assembly: Make use of std::array where applicable
Same behavior, minus any potential implicit array to pointer decay.
---
src/video_core/primitive_assembly.cpp | 2 +-
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 cdc484d67..182a69772 100644
--- a/src/video_core/primitive_assembly.cpp
+++ b/src/video_core/primitive_assembly.cpp
@@ -11,7 +11,7 @@ namespace Pica {
template <typename VertexType>
PrimitiveAssembler<VertexType>::PrimitiveAssembler(PipelineRegs::TriangleTopology topology)
- : topology(topology), buffer_index(0) {}
+ : topology(topology) {}
template <typename VertexType>
void PrimitiveAssembler<VertexType>::SubmitVertex(const VertexType& vtx,
diff --git a/src/video_core/primitive_assembly.h b/src/video_core/primitive_assembly.h
index 404bc5316..f453ac82e 100644
--- a/src/video_core/primitive_assembly.h
+++ b/src/video_core/primitive_assembly.h
@@ -4,6 +4,7 @@
#pragma once
+#include <array>
#include <functional>
#include <boost/serialization/access.hpp>
#include "video_core/regs_pipeline.h"
@@ -59,8 +60,8 @@ struct PrimitiveAssembler {
private:
PipelineRegs::TriangleTopology topology;
- int buffer_index;
- VertexType buffer[2];
+ int buffer_index = 0;
+ std::array<VertexType, 2> buffer;
bool strip_ready = false;
bool winding = false;