summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-12-19 01:42:19 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-01-30 06:31:36 +0100
commitab6954e942654fb003964fc95c0846aa8b89ac91 (patch)
tree5bcd962d8a38044f71967f41ba9cab70a942e2f0 /src/video_core/shader
parentVideoCore: Change misleading register names (diff)
downloadyuzu-ab6954e942654fb003964fc95c0846aa8b89ac91.tar
yuzu-ab6954e942654fb003964fc95c0846aa8b89ac91.tar.gz
yuzu-ab6954e942654fb003964fc95c0846aa8b89ac91.tar.bz2
yuzu-ab6954e942654fb003964fc95c0846aa8b89ac91.tar.lz
yuzu-ab6954e942654fb003964fc95c0846aa8b89ac91.tar.xz
yuzu-ab6954e942654fb003964fc95c0846aa8b89ac91.tar.zst
yuzu-ab6954e942654fb003964fc95c0846aa8b89ac91.zip
Diffstat (limited to 'src/video_core/shader')
-rw-r--r--src/video_core/shader/shader.cpp2
-rw-r--r--src/video_core/shader/shader.h4
-rw-r--r--src/video_core/shader/shader_interpreter.cpp4
-rw-r--r--src/video_core/shader/shader_interpreter.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index 2da50bd62..971ce5b7a 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -71,7 +71,7 @@ OutputVertex OutputVertex::FromRegisters(Math::Vec4<float24> output_regs[16], co
return ret;
}
-void UnitState::LoadInputVertex(const InputVertex& input, int num_attributes) {
+void UnitState::LoadInput(const AttributeBuffer& input, int num_attributes) {
// Setup input register table
const auto& attribute_register_map = g_state.regs.vs.input_register_map;
diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h
index 44d9f76c3..cb38ec0a6 100644
--- a/src/video_core/shader/shader.h
+++ b/src/video_core/shader/shader.h
@@ -23,7 +23,7 @@ namespace Pica {
namespace Shader {
-struct InputVertex {
+struct AttributeBuffer {
alignas(16) Math::Vec4<float24> attr[16];
};
@@ -140,7 +140,7 @@ struct UnitState {
* @param input Input vertex into the shader
* @param num_attributes The number of vertex shader attributes to load
*/
- void LoadInputVertex(const InputVertex& input, int num_attributes);
+ void LoadInput(const AttributeBuffer& input, int num_attributes);
};
struct ShaderSetup {
diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp
index c0c89b857..d803aebbf 100644
--- a/src/video_core/shader/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -668,14 +668,14 @@ void InterpreterEngine::Run(const ShaderSetup& setup, UnitState& state) const {
}
DebugData<true> InterpreterEngine::ProduceDebugInfo(const ShaderSetup& setup,
- const InputVertex& input,
+ const AttributeBuffer& input,
int num_attributes) const {
UnitState state;
DebugData<true> debug_data;
// Setup input register table
boost::fill(state.registers.input, Math::Vec4<float24>::AssignToAll(float24::Zero()));
- state.LoadInputVertex(input, num_attributes);
+ state.LoadInput(input, num_attributes);
RunInterpreter(setup, state, debug_data, setup.engine_data.entry_point);
return debug_data;
}
diff --git a/src/video_core/shader/shader_interpreter.h b/src/video_core/shader/shader_interpreter.h
index d6c0e2d8c..593e02157 100644
--- a/src/video_core/shader/shader_interpreter.h
+++ b/src/video_core/shader/shader_interpreter.h
@@ -23,7 +23,7 @@ public:
* @param config Configuration object for the shader pipeline
* @return Debug information for this shader with regards to the given vertex
*/
- DebugData<true> ProduceDebugInfo(const ShaderSetup& setup, const InputVertex& input,
+ DebugData<true> ProduceDebugInfo(const ShaderSetup& setup, const AttributeBuffer& input,
int num_attributes) const;
};