summaryrefslogtreecommitdiff
path: root/src/video_core/vertex_loader.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-02-04 13:02:48 -0800
committerGravatar GitHub2017-02-04 13:02:48 -0800
commit97e06b0a0daccd3347ae1bcaf294093b5af32e85 (patch)
tree59e1997c90558f58f7368d6974c355e1f20d8f32 /src/video_core/vertex_loader.cpp
parentMerge pull request #2414 from yuriks/texture-decode (diff)
parentVideoCore: Make PrimitiveAssembler const-correct (diff)
downloadyuzu-97e06b0a0daccd3347ae1bcaf294093b5af32e85.tar.gz
yuzu-97e06b0a0daccd3347ae1bcaf294093b5af32e85.tar.xz
yuzu-97e06b0a0daccd3347ae1bcaf294093b5af32e85.zip
Merge pull request #2476 from yuriks/shader-refactor3
Oh No! More shader changes!
Diffstat (limited to 'src/video_core/vertex_loader.cpp')
-rw-r--r--src/video_core/vertex_loader.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/vertex_loader.cpp b/src/video_core/vertex_loader.cpp
index 2b8ef7018..bf83b61ca 100644
--- a/src/video_core/vertex_loader.cpp
+++ b/src/video_core/vertex_loader.cpp
@@ -70,7 +70,8 @@ void VertexLoader::Setup(const Pica::Regs& regs) {
70 is_setup = true; 70 is_setup = true;
71} 71}
72 72
73void VertexLoader::LoadVertex(u32 base_address, int index, int vertex, Shader::InputVertex& input, 73void VertexLoader::LoadVertex(u32 base_address, int index, int vertex,
74 Shader::AttributeBuffer& input,
74 DebugUtils::MemoryAccessTracker& memory_accesses) { 75 DebugUtils::MemoryAccessTracker& memory_accesses) {
75 ASSERT_MSG(is_setup, "A VertexLoader needs to be setup before loading vertices."); 76 ASSERT_MSG(is_setup, "A VertexLoader needs to be setup before loading vertices.");
76 77
@@ -142,7 +143,7 @@ void VertexLoader::LoadVertex(u32 base_address, int index, int vertex, Shader::I
142 input.attr[i][2].ToFloat32(), input.attr[i][3].ToFloat32()); 143 input.attr[i][2].ToFloat32(), input.attr[i][3].ToFloat32());
143 } else if (vertex_attribute_is_default[i]) { 144 } else if (vertex_attribute_is_default[i]) {
144 // Load the default attribute if we're configured to do so 145 // Load the default attribute if we're configured to do so
145 input.attr[i] = g_state.vs_default_attributes[i]; 146 input.attr[i] = g_state.input_default_attributes.attr[i];
146 LOG_TRACE(HW_GPU, 147 LOG_TRACE(HW_GPU,
147 "Loaded default attribute %x for vertex %x (index %x): (%f, %f, %f, %f)", i, 148 "Loaded default attribute %x for vertex %x (index %x): (%f, %f, %f, %f)", i,
148 vertex, index, input.attr[i][0].ToFloat32(), input.attr[i][1].ToFloat32(), 149 vertex, index, input.attr[i][0].ToFloat32(), input.attr[i][1].ToFloat32(),