diff options
| author | FernandoS27 <fsahmkow27@gmail.com> | 2021-05-01 14:56:25 +0200 |
|---|---|---|
| committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-07-22 21:51:29 -0400 |
| commit | c49d56c931471f21d475a31272164fbfae5ea64a (patch) | |
| tree | 71642406f4df7963ea78c55acf622bdf5b85a595 /src/shader_recompiler/frontend/maxwell/program.cpp | |
| parent | b541f5e5e333a8ec8c3569e02d67e59ad14217c2 (diff) | |
shader: Address feedback
Diffstat (limited to 'src/shader_recompiler/frontend/maxwell/program.cpp')
| -rw-r--r-- | src/shader_recompiler/frontend/maxwell/program.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/shader_recompiler/frontend/maxwell/program.cpp b/src/shader_recompiler/frontend/maxwell/program.cpp index 59897cb3e1..a4fa4319da 100644 --- a/src/shader_recompiler/frontend/maxwell/program.cpp +++ b/src/shader_recompiler/frontend/maxwell/program.cpp @@ -151,31 +151,30 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo } IR::Program MergeDualVertexPrograms(IR::Program& vertex_a, IR::Program& vertex_b, - Environment& env2) { - IR::Program program{}; + Environment& env_vertex_b) { + IR::Program result{}; Optimization::VertexATransformPass(vertex_a); Optimization::VertexBTransformPass(vertex_b); - program.blocks.swap(vertex_a.blocks); + std::swap(result.blocks, vertex_a.blocks); for (IR::Block* block : vertex_b.blocks) { - program.blocks.push_back(block); + result.blocks.push_back(block); } - program.stage = Stage::VertexB; - program.info = vertex_a.info; - program.local_memory_size = std::max(vertex_a.local_memory_size, vertex_b.local_memory_size); + result.stage = Stage::VertexB; + result.info = vertex_a.info; + result.local_memory_size = std::max(vertex_a.local_memory_size, vertex_b.local_memory_size); - for (size_t index = 0; index < 32; index++) { - program.info.input_generics[index].used |= vertex_b.info.input_generics[index].used; - program.info.stores_generics[index] |= vertex_b.info.stores_generics[index]; + for (size_t index = 0; index < 32; ++index) { + result.info.input_generics[index].used |= vertex_b.info.input_generics[index].used; + result.info.stores_generics[index] |= vertex_b.info.stores_generics[index]; } - Optimization::JoinTextureInfo(program.info, vertex_b.info); - Optimization::JoinStorageInfo(program.info, vertex_b.info); - Optimization::DualVertexJoinPass(program); - program.post_order_blocks = PostOrder(program.blocks); - Optimization::DeadCodeEliminationPass(program); - Optimization::IdentityRemovalPass(program); - Optimization::VerificationPass(program); - Optimization::CollectShaderInfoPass(env2, program); - return program; + Optimization::JoinTextureInfo(result.info, vertex_b.info); + Optimization::JoinStorageInfo(result.info, vertex_b.info); + Optimization::DualVertexJoinPass(result); + result.post_order_blocks = PostOrder(result.blocks); + Optimization::DeadCodeEliminationPass(result); + Optimization::VerificationPass(result); + Optimization::CollectShaderInfoPass(env_vertex_b, result); + return result; } } // namespace Shader::Maxwell |