daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-12-25 10:51:21 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1733 from lioncash/vert_loader

Browse Source 
VertexLoader: Minor changes
This commit is contained in:
bunnei 2016-05-23 21:13:34 -04:00
commit a316fbb15a
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/video_core/command_processor.cpp
View File

@ -199,9 +199,8 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
// Processes information about internal vertex attributes to figure out how a vertex is loaded. // Processes information about internal vertex attributes to figure out how a vertex is loaded.
// Later, these can be compiled and cached. // Later, these can be compiled and cached.
VertexLoader loader;
const u32 base_address = regs.vertex_attributes.GetPhysicalBaseAddress(); const u32 base_address = regs.vertex_attributes.GetPhysicalBaseAddress();
loader.Setup(regs); VertexLoader loader(regs);
// Load vertices // Load vertices
bool is_indexed = (id == PICA_REG_INDEX(trigger_draw_indexed)); bool is_indexed = (id == PICA_REG_INDEX(trigger_draw_indexed));

8
src/video_core/vertex_loader.cpp
View File

@ -2,8 +2,8 @@
#include <boost/range/algorithm/fill.hpp> #include <boost/range/algorithm/fill.hpp>
#include "common/assert.h"
#include "common/alignment.h" #include "common/alignment.h"
#include "common/assert.h"
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/logging/log.h" #include "common/logging/log.h"
@ -21,6 +21,8 @@
namespace Pica { namespace Pica {
void VertexLoader::Setup(const Pica::Regs& regs) { void VertexLoader::Setup(const Pica::Regs& regs) {
ASSERT_MSG(!is_setup, "VertexLoader is not intended to be setup more than once.");
const auto& attribute_config = regs.vertex_attributes; const auto& attribute_config = regs.vertex_attributes;
num_total_attributes = attribute_config.GetNumTotalAttributes(); num_total_attributes = attribute_config.GetNumTotalAttributes();
@ -60,9 +62,13 @@ void VertexLoader::Setup(const Pica::Regs& regs) {
} }
} }
} }
is_setup = true;
} }
void VertexLoader::LoadVertex(u32 base_address, int index, int vertex, Shader::InputVertex& input, DebugUtils::MemoryAccessTracker& memory_accesses) { void VertexLoader::LoadVertex(u32 base_address, int index, int vertex, Shader::InputVertex& input, DebugUtils::MemoryAccessTracker& memory_accesses) {
ASSERT_MSG(is_setup, "A VertexLoader needs to be setup before loading vertices.");
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) {
// Load per-vertex data from the loader arrays // Load per-vertex data from the loader arrays

23
src/video_core/vertex_loader.h
View File

@ -1,7 +1,8 @@
#pragma once #pragma once
#include "common/common_types.h" #include <array>
#include "common/common_types.h"
#include "video_core/pica.h" #include "video_core/pica.h"
namespace Pica { namespace Pica {
@ -11,23 +12,29 @@ class MemoryAccessTracker;
} }
namespace Shader { namespace Shader {
class InputVertex; struct InputVertex;
} }
class VertexLoader { class VertexLoader {
public: public:
VertexLoader() = default;
explicit VertexLoader(const Pica::Regs& regs) {
Setup(regs);
}
void Setup(const Pica::Regs& regs); void Setup(const Pica::Regs& regs);
void LoadVertex(u32 base_address, int index, int vertex, Shader::InputVertex& input, DebugUtils::MemoryAccessTracker& memory_accesses); void LoadVertex(u32 base_address, int index, int vertex, Shader::InputVertex& input, DebugUtils::MemoryAccessTracker& memory_accesses);
int GetNumTotalAttributes() const { return num_total_attributes; } int GetNumTotalAttributes() const { return num_total_attributes; }
private: private:
u32 vertex_attribute_sources[16]; std::array<u32, 16> vertex_attribute_sources;
u32 vertex_attribute_strides[16] = {}; std::array<u32, 16> vertex_attribute_strides{};
Regs::VertexAttributeFormat vertex_attribute_formats[16] = {}; std::array<Regs::VertexAttributeFormat, 16> vertex_attribute_formats;
u32 vertex_attribute_elements[16] = {}; std::array<u32, 16> vertex_attribute_elements{};
bool vertex_attribute_is_default[16]; std::array<bool, 16> vertex_attribute_is_default;
int num_total_attributes; int num_total_attributes = 0;
bool is_setup = false;
}; };
} // namespace Pica } // namespace Pica