diff options
| author | 2020-03-22 20:13:05 +0700 | |
|---|---|---|
| committer | 2020-04-05 10:31:29 +0700 | |
| commit | 58bcb86af54bb00e3a01db02c7ed1945b68ea44c (patch) | |
| tree | 75ecff0623f988497c959d0bc2a0102ade9ad63f /src/video_core/shader | |
| parent | clang-fix (diff) | |
| download | yuzu-58bcb86af54bb00e3a01db02c7ed1945b68ea44c.tar.gz yuzu-58bcb86af54bb00e3a01db02c7ed1945b68ea44c.tar.xz yuzu-58bcb86af54bb00e3a01db02c7ed1945b68ea44c.zip | |
add shader stage when init shader ir
Diffstat (limited to 'src/video_core/shader')
| -rw-r--r-- | src/video_core/shader/shader_ir.cpp | 7 | ||||
| -rw-r--r-- | src/video_core/shader/shader_ir.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/video_core/shader/shader_ir.cpp b/src/video_core/shader/shader_ir.cpp index baf7188d2..bbd86a2c5 100644 --- a/src/video_core/shader/shader_ir.cpp +++ b/src/video_core/shader/shader_ir.cpp | |||
| @@ -24,9 +24,10 @@ using Tegra::Shader::PredCondition; | |||
| 24 | using Tegra::Shader::PredOperation; | 24 | using Tegra::Shader::PredOperation; |
| 25 | using Tegra::Shader::Register; | 25 | using Tegra::Shader::Register; |
| 26 | 26 | ||
| 27 | ShaderIR::ShaderIR(const ProgramCode& program_code, u32 main_offset, CompilerSettings settings, | 27 | ShaderIR::ShaderIR(const ProgramCode& program_code, Tegra::Engines::ShaderType shader_stage, |
| 28 | Registry& registry) | 28 | u32 main_offset, CompilerSettings settings, Registry& registry) |
| 29 | : program_code{program_code}, main_offset{main_offset}, settings{settings}, registry{registry} { | 29 | : program_code{program_code}, shader_stage{shader_stage}, |
| 30 | main_offset{main_offset}, settings{settings}, registry{registry} { | ||
| 30 | Decode(); | 31 | Decode(); |
| 31 | PostDecode(); | 32 | PostDecode(); |
| 32 | } | 33 | } |
diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h index 80fc9b82c..e531181cd 100644 --- a/src/video_core/shader/shader_ir.h +++ b/src/video_core/shader/shader_ir.h | |||
| @@ -68,8 +68,8 @@ struct GlobalMemoryUsage { | |||
| 68 | 68 | ||
| 69 | class ShaderIR final { | 69 | class ShaderIR final { |
| 70 | public: | 70 | public: |
| 71 | explicit ShaderIR(const ProgramCode& program_code, u32 main_offset, CompilerSettings settings, | 71 | explicit ShaderIR(const ProgramCode& program_code, Tegra::Engines::ShaderType shader_stage, |
| 72 | Registry& registry); | 72 | u32 main_offset, CompilerSettings settings, Registry& registry); |
| 73 | ~ShaderIR(); | 73 | ~ShaderIR(); |
| 74 | 74 | ||
| 75 | const std::map<u32, NodeBlock>& GetBasicBlocks() const { | 75 | const std::map<u32, NodeBlock>& GetBasicBlocks() const { |
| @@ -419,6 +419,7 @@ private: | |||
| 419 | u32 NewCustomVariable(); | 419 | u32 NewCustomVariable(); |
| 420 | 420 | ||
| 421 | const ProgramCode& program_code; | 421 | const ProgramCode& program_code; |
| 422 | const Tegra::Engines::ShaderType shader_stage; | ||
| 422 | const u32 main_offset; | 423 | const u32 main_offset; |
| 423 | const CompilerSettings settings; | 424 | const CompilerSettings settings; |
| 424 | Registry& registry; | 425 | Registry& registry; |