flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

vk_shader_decompiler: Clean code and be const correct.

Browse source
This commit is contained in:
Fernando Sahmkow 2019-09-24 10:57:45 -04:00 committed by FernandoS27
parent 7c756baa77
commit 000ad558dd
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View file

@ -19,8 +19,8 @@
#include "video_core/renderer_opengl/gl_device.h" #include "video_core/renderer_opengl/gl_device.h"
#include "video_core/renderer_opengl/gl_rasterizer.h" #include "video_core/renderer_opengl/gl_rasterizer.h"
#include "video_core/renderer_opengl/gl_shader_decompiler.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/ast.h"
#include "video_core/shader/node.h"
#include "video_core/shader/shader_ir.h" #include "video_core/shader/shader_ir.h"
namespace OpenGL::GLShader { namespace OpenGL::GLShader {

12
src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
View file

@ -1659,12 +1659,12 @@ public:
} }
void operator()(VideoCommon::Shader::ExprPredicate& expr) { 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))); current_id = decomp.Emit(decomp.OpLoad(decomp.t_bool, decomp.predicates.at(pred)));
} }
void operator()(VideoCommon::Shader::ExprCondCode& expr) { void operator()(VideoCommon::Shader::ExprCondCode& expr) {
Node cc = decomp.ir.GetConditionCode(expr.cc); const Node cc = decomp.ir.GetConditionCode(expr.cc);
Id target; Id target;
if (const auto pred = std::get_if<PredicateNode>(&*cc)) { if (const auto pred = std::get_if<PredicateNode>(&*cc)) {
@ -1785,8 +1785,7 @@ public:
} }
void operator()(VideoCommon::Shader::ASTReturn& ast) { void operator()(VideoCommon::Shader::ASTReturn& ast) {
bool is_true = VideoCommon::Shader::ExprIsTrue(ast.condition); if (!VideoCommon::Shader::ExprIsTrue(ast.condition)) {
if (!is_true) {
ExprDecompiler expr_parser{decomp}; ExprDecompiler expr_parser{decomp};
const Id condition = expr_parser.Visit(ast.condition); const Id condition = expr_parser.Visit(ast.condition);
const Id then_label = decomp.OpLabel(); const Id then_label = decomp.OpLabel();
@ -1816,8 +1815,7 @@ public:
} }
void operator()(VideoCommon::Shader::ASTBreak& ast) { void operator()(VideoCommon::Shader::ASTBreak& ast) {
bool is_true = VideoCommon::Shader::ExprIsTrue(ast.condition); if (!VideoCommon::Shader::ExprIsTrue(ast.condition)) {
if (!is_true) {
ExprDecompiler expr_parser{decomp}; ExprDecompiler expr_parser{decomp};
const Id condition = expr_parser.Visit(ast.condition); const Id condition = expr_parser.Visit(ast.condition);
const Id then_label = decomp.OpLabel(); const Id then_label = decomp.OpLabel();
@ -1846,7 +1844,7 @@ private:
}; };
void SPIRVDecompiler::DecompileAST() { 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++) { for (u32 i = 0; i < num_flow_variables; i++) {
const Id id = OpVariable(t_prv_bool, spv::StorageClass::Private, v_false); const Id id = OpVariable(t_prv_bool, spv::StorageClass::Private, v_false);
Name(id, fmt::format("flow_var_{}", i)); Name(id, fmt::format("flow_var_{}", i));