From 000ad558dd21a0f1f0be57ddbb59540956314896 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Tue, 24 Sep 2019 10:57:45 -0400
Subject: [PATCH] vk_shader_decompiler: Clean code and be const correct.
---
.../renderer_opengl/gl_shader_decompiler.cpp | 2 +-
.../renderer_vulkan/vk_shader_decompiler.cpp | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 572fae3533..bff1067a4b 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -19,8 +19,8 @@
#include "video_core/renderer_opengl/gl_device.h"
#include "video_core/renderer_opengl/gl_rasterizer.h"
#include "video_core/renderer_opengl/gl_shader_decompiler.h"
-#include "video_core/shader/node.h"
#include "video_core/shader/ast.h"
+#include "video_core/shader/node.h"
#include "video_core/shader/shader_ir.h"
namespace OpenGL::GLShader {
diff --git a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
index 11effe4a1a..4bc7da198e 100644
--- a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
+++ b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
@@ -1659,12 +1659,12 @@ public:
}
void operator()(VideoCommon::Shader::ExprPredicate& expr) {
- auto pred = static_cast<Tegra::Shader::Pred>(expr.predicate);
+ const auto pred = static_cast<Tegra::Shader::Pred>(expr.predicate);
current_id = decomp.Emit(decomp.OpLoad(decomp.t_bool, decomp.predicates.at(pred)));
}
void operator()(VideoCommon::Shader::ExprCondCode& expr) {
- Node cc = decomp.ir.GetConditionCode(expr.cc);
+ const Node cc = decomp.ir.GetConditionCode(expr.cc);
Id target;
if (const auto pred = std::get_if<PredicateNode>(&*cc)) {
@@ -1785,8 +1785,7 @@ public:
}
void operator()(VideoCommon::Shader::ASTReturn& ast) {
- bool is_true = VideoCommon::Shader::ExprIsTrue(ast.condition);
- if (!is_true) {
+ if (!VideoCommon::Shader::ExprIsTrue(ast.condition)) {
ExprDecompiler expr_parser{decomp};
const Id condition = expr_parser.Visit(ast.condition);
const Id then_label = decomp.OpLabel();
@@ -1816,8 +1815,7 @@ public:
}
void operator()(VideoCommon::Shader::ASTBreak& ast) {
- bool is_true = VideoCommon::Shader::ExprIsTrue(ast.condition);
- if (!is_true) {
+ if (!VideoCommon::Shader::ExprIsTrue(ast.condition)) {
ExprDecompiler expr_parser{decomp};
const Id condition = expr_parser.Visit(ast.condition);
const Id then_label = decomp.OpLabel();
@@ -1846,7 +1844,7 @@ private:
};
void SPIRVDecompiler::DecompileAST() {
- u32 num_flow_variables = ir.GetASTNumVariables();
+ const u32 num_flow_variables = ir.GetASTNumVariables();
for (u32 i = 0; i < num_flow_variables; i++) {
const Id id = OpVariable(t_prv_bool, spv::StorageClass::Private, v_false);
Name(id, fmt::format("flow_var_{}", i));
--
GitLab