N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move "&" to their proper place, add missing includes and make some properly relative.

Browse source
This commit is contained in:
Henrik Rydgard 2016-04-28 19:40:11 +02:00
parent 47ff008817
commit d00e2340c6
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/video_core/vertex_loader.cpp
View file

@ -14,14 +14,14 @@
#include "debug_utils/debug_utils.h" #include "debug_utils/debug_utils.h"
#include "pica.h" #include "video_core/pica.h"
#include "pica_state.h" #include "video_core/pica_state.h"
#include "pica_types.h" #include "video_core/pica_types.h"
#include "vertex_loader.h" #include "video_core/vertex_loader.h"
namespace Pica { namespace Pica {
void VertexLoader::Setup(const Pica::Regs &regs) { void VertexLoader::Setup(const Pica::Regs& regs) {
const auto& attribute_config = regs.vertex_attributes; const auto& attribute_config = regs.vertex_attributes;
base_address = attribute_config.GetPhysicalBaseAddress(); base_address = attribute_config.GetPhysicalBaseAddress();
num_total_attributes = attribute_config.GetNumTotalAttributes(); 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) { for (int i = 0; i < num_total_attributes; ++i) {
if (vertex_attribute_elements[i] != 0) { if (vertex_attribute_elements[i] != 0) {
// Default attribute values set if array elements have < 4 components. This // Default attribute values set if array elements have < 4 components. This

7
src/video_core/vertex_loader.h
View file

@ -1,5 +1,8 @@
#pragma once #pragma once
#include <iterator>
#include <algorithm>
#include "video_core/pica.h" #include "video_core/pica.h"
#include "video_core/shader/shader.h" #include "video_core/shader/shader.h"
@ -34,8 +37,8 @@ public:
class VertexLoader { class VertexLoader {
public: public:
void Setup(const Pica::Regs &regs); void Setup(const Pica::Regs& regs);
void LoadVertex(int index, int vertex, Shader::InputVertex &input, MemoryAccesses &memory_accesses); void LoadVertex(int index, int vertex, Shader::InputVertex& input, MemoryAccesses& memory_accesses);
u32 GetPhysicalBaseAddress() const { return base_address; } u32 GetPhysicalBaseAddress() const { return base_address; }
int GetNumTotalAttributes() const { return num_total_attributes; } int GetNumTotalAttributes() const { return num_total_attributes; }