From d00e2340c63c61ccb987c4ab0d76957f6cc84144 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Thu, 28 Apr 2016 19:40:11 +0200
Subject: Move "&" to their proper place, add missing includes and make some
 properly relative.

---
 src/video_core/vertex_loader.cpp | 12 ++++++------
 src/video_core/vertex_loader.h   |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/video_core/vertex_loader.cpp b/src/video_core/vertex_loader.cpp
index 258002b07..958201e5e 100644
--- a/src/video_core/vertex_loader.cpp
+++ b/src/video_core/vertex_loader.cpp
@@ -14,14 +14,14 @@
 
 #include "debug_utils/debug_utils.h"
 
-#include "pica.h"
-#include "pica_state.h"
-#include "pica_types.h"
-#include "vertex_loader.h"
+#include "video_core/pica.h"
+#include "video_core/pica_state.h"
+#include "video_core/pica_types.h"
+#include "video_core/vertex_loader.h"
 
 namespace Pica {
 
-void VertexLoader::Setup(const Pica::Regs &regs) {
+void VertexLoader::Setup(const Pica::Regs& regs) {
     const auto& attribute_config = regs.vertex_attributes;
     base_address = attribute_config.GetPhysicalBaseAddress();
     num_total_attributes = attribute_config.GetNumTotalAttributes();
@@ -66,7 +66,7 @@ void VertexLoader::Setup(const Pica::Regs &regs) {
     }
 }
 
-void VertexLoader::LoadVertex(int index, int vertex, Shader::InputVertex &input, MemoryAccesses &memory_accesses) {
+void VertexLoader::LoadVertex(int index, int vertex, Shader::InputVertex& input, MemoryAccesses& memory_accesses) {
     for (int i = 0; i < num_total_attributes; ++i) {
         if (vertex_attribute_elements[i] != 0) {
             // Default attribute values set if array elements have < 4 components. This
diff --git a/src/video_core/vertex_loader.h b/src/video_core/vertex_loader.h
index 4ff62d97b..560d36edc 100644
--- a/src/video_core/vertex_loader.h
+++ b/src/video_core/vertex_loader.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <iterator>
+#include <algorithm>
+
 #include "video_core/pica.h"
 #include "video_core/shader/shader.h"
 
@@ -34,8 +37,8 @@ public:
 
 class VertexLoader {
 public:
-    void Setup(const Pica::Regs &regs);
-    void LoadVertex(int index, int vertex, Shader::InputVertex &input, MemoryAccesses &memory_accesses);
+    void Setup(const Pica::Regs& regs);
+    void LoadVertex(int index, int vertex, Shader::InputVertex& input, MemoryAccesses& memory_accesses);
 
     u32 GetPhysicalBaseAddress() const { return base_address; }
     int GetNumTotalAttributes() const { return num_total_attributes; }
-- 
cgit v1.2.3