summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-09-24 16:57:45 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-10-05 00:52:55 +0200
commit000ad558dd21a0f1f0be57ddbb59540956314896 (patch)
treea4ea12c3500f86e139a6da600133ba8c4dcb66bc
parentShader_IR: clean up AST handling and add documentation. (diff)
downloadyuzu-000ad558dd21a0f1f0be57ddbb59540956314896.tar
yuzu-000ad558dd21a0f1f0be57ddbb59540956314896.tar.gz
yuzu-000ad558dd21a0f1f0be57ddbb59540956314896.tar.bz2
yuzu-000ad558dd21a0f1f0be57ddbb59540956314896.tar.lz
yuzu-000ad558dd21a0f1f0be57ddbb59540956314896.tar.xz
yuzu-000ad558dd21a0f1f0be57ddbb59540956314896.tar.zst
yuzu-000ad558dd21a0f1f0be57ddbb59540956314896.zip
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp2
-rw-r--r--src/video_core/renderer_vulkan/vk_shader_decompiler.cpp12
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 572fae353..bff1067a4 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 11effe4a1..4bc7da198 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));