Skip to content

Feat[glsl_visitor]: print function prototypes in some cases #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whitebelyash wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feat[glsl_visitor]: print function prototypes in some cases #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 47 additions & 17 deletions ltw/src/main/tinywrapper/glsl_optimizer/src/code/ir_print_glsl_visitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,32 @@ char * IR_TO_GLSL::Convert(
global.enable_nan_check = shader_nan_check;
int uses_texlod_impl = 0;
int uses_texlodproj_impl = 0;

foreach_in_list(ir_instruction, ir, instructions)
{
if(ir->ir_type == ir_type_function)
{
IR_TO_GLSL v(res, &global, state);
v.mode = 0;
ir_function* func = (ir_function*)ir;
bool user_sig = false;
foreach_in_list(ir_function_signature, sig, &func->signatures)
{
if (!sig->is_builtin()) {
user_sig = true;
break;
}
}
if(!user_sig || strcmp(func->name, "main") == 0) continue;
foreach_in_list(ir_function_signature, sig, &func->signatures)
{
if(sig->is_builtin() || !sig->is_defined) continue;
v.print_function_header(sig);
res.append(");\n");
}
}
}

loop_state* ls = analyze_loop_variables(instructions);
if (ls)
{
Expand Down Expand Up @@ -709,23 +735,7 @@ IR_TO_GLSL::visit(ir_function_signature* ir)
{
_mesa_symbol_table_push_scope(symbols);

print_type(generated_source, ir->return_type, true);
generated_source.append(" %s(", ir->function_name());

if (!ir->parameters.is_empty())
{
previous_skipped = false;
bool first = true;
foreach_in_list(ir_variable, inst, &ir->parameters)
{
if (!first)
generated_source.append(", ");
indent();
inst->accept(this);
first = false;
}
indent();
}
print_function_header(ir);

if (ir->body.is_empty() && strcmp(ir->function()->name, "main") != 0)
{
Expand Down Expand Up @@ -2351,3 +2361,23 @@ void IR_TO_GLSL::visit_uniform_block(ir_variable *ir) {
generated_source.append( " %s", ir->name );
}
}

void IR_TO_GLSL::print_function_header(ir_function_signature *sig) {
print_type(generated_source, sig->return_type, true);
generated_source.append(" %s(", sig->function_name());

if (!sig->parameters.is_empty())
{
previous_skipped = false;
bool first = true;
foreach_in_list(ir_variable, inst, &sig->parameters)
{
if (!first)
generated_source.append(", ");
indent();
inst->accept(this);
first = false;
}
indent();
}
}
1 change: 1 addition & 0 deletions ltw/src/main/tinywrapper/glsl_optimizer/src/code/ir_print_glsl_visitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class IR_TO_GLSL : public ir_visitor
bool can_emit_canonical_for(loop_variable_state *ls);
bool emit_canonical_for(ir_loop* ir);
bool try_print_array_assignment(ir_dereference* lhs, ir_rvalue* rhs);
void print_function_header(ir_function_signature* sig);

virtual void visit(ir_rvalue *);
virtual void visit(ir_variable *);
Expand Down