diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-01-28 22:03:13 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-02-04 22:59:11 +0100 |
commit | f7c7f422c6995a31c1a16c0865bbe13bb38469a3 (patch) | |
tree | 6dca1dfe528cc115dd1be8d6dd7a97f491140540 /src/video_core/shader | |
parent | VideoCore: Split geometry pipeline regs from Regs struct (diff) | |
download | yuzu-f7c7f422c6995a31c1a16c0865bbe13bb38469a3.tar yuzu-f7c7f422c6995a31c1a16c0865bbe13bb38469a3.tar.gz yuzu-f7c7f422c6995a31c1a16c0865bbe13bb38469a3.tar.bz2 yuzu-f7c7f422c6995a31c1a16c0865bbe13bb38469a3.tar.lz yuzu-f7c7f422c6995a31c1a16c0865bbe13bb38469a3.tar.xz yuzu-f7c7f422c6995a31c1a16c0865bbe13bb38469a3.tar.zst yuzu-f7c7f422c6995a31c1a16c0865bbe13bb38469a3.zip |
Diffstat (limited to 'src/video_core/shader')
-rw-r--r-- | src/video_core/shader/shader.cpp | 4 | ||||
-rw-r--r-- | src/video_core/shader/shader.h | 4 | ||||
-rw-r--r-- | src/video_core/shader/shader_interpreter.cpp | 2 | ||||
-rw-r--r-- | src/video_core/shader/shader_interpreter.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index 916ea8823..840777a66 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp @@ -66,7 +66,7 @@ OutputVertex OutputVertex::FromAttributeBuffer(const RasterizerRegs& regs, Attri return ret; } -void UnitState::LoadInput(const Regs::ShaderConfig& config, const AttributeBuffer& input) { +void UnitState::LoadInput(const ShaderRegs& config, const AttributeBuffer& input) { const unsigned max_attribute = config.max_input_attribute_index; for (unsigned attr = 0; attr <= max_attribute; ++attr) { @@ -75,7 +75,7 @@ void UnitState::LoadInput(const Regs::ShaderConfig& config, const AttributeBuffe } } -void UnitState::WriteOutput(const Regs::ShaderConfig& config, AttributeBuffer& output) { +void UnitState::WriteOutput(const ShaderRegs& config, AttributeBuffer& output) { unsigned int output_i = 0; for (unsigned int reg : Common::BitSet<u32>(config.output_mask)) { output.attr[output_i++] = registers.output[reg]; diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h index e4b68f958..a469e294b 100644 --- a/src/video_core/shader/shader.h +++ b/src/video_core/shader/shader.h @@ -116,9 +116,9 @@ struct UnitState { * @param config Shader configuration registers corresponding to the unit. * @param input Attribute buffer to load into the input registers. */ - void LoadInput(const Regs::ShaderConfig& config, const AttributeBuffer& input); + void LoadInput(const ShaderRegs& config, const AttributeBuffer& input); - void WriteOutput(const Regs::ShaderConfig& config, AttributeBuffer& output); + void WriteOutput(const ShaderRegs& config, AttributeBuffer& output); }; struct ShaderSetup { diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp index 81522b8f5..f4d1c46c5 100644 --- a/src/video_core/shader/shader_interpreter.cpp +++ b/src/video_core/shader/shader_interpreter.cpp @@ -669,7 +669,7 @@ void InterpreterEngine::Run(const ShaderSetup& setup, UnitState& state) const { DebugData<true> InterpreterEngine::ProduceDebugInfo(const ShaderSetup& setup, const AttributeBuffer& input, - const Regs::ShaderConfig& config) const { + const ShaderRegs& config) const { UnitState state; DebugData<true> debug_data; diff --git a/src/video_core/shader/shader_interpreter.h b/src/video_core/shader/shader_interpreter.h index d7a61e122..5682b3a39 100644 --- a/src/video_core/shader/shader_interpreter.h +++ b/src/video_core/shader/shader_interpreter.h @@ -23,7 +23,7 @@ public: * @return Debug information for this shader with regards to the given vertex */ DebugData<true> ProduceDebugInfo(const ShaderSetup& setup, const AttributeBuffer& input, - const Regs::ShaderConfig& config) const; + const ShaderRegs& config) const; }; } // namespace |