Skip to content

[hxsl] Renamed @varying in @var, removed @function and fixed struct decls in Printer output #1349

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
EspeuteClement wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −6
Open

[hxsl] Renamed @varying in @var, removed @function and fixed struct decls in Printer output #1349

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
15 changes: 9 additions & 6 deletions hxsl/Printer.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class Printer {
public function shaderString( s : ShaderData ) {
buffer = new StringBuf();
for( v in s.vars ) {
if(v.kind == Function)
continue;
addVar(v, null);
add(";\n");
}
Expand Down Expand Up @@ -76,7 +78,7 @@ class Printer {
case Global:
add("@global ");
case Var:
add("@varying ");
add("@var ");
case Param:
add("@param ");
case Input:
Expand All @@ -86,19 +88,20 @@ class Printer {
case Output:
add("@output ");
}
add("var ");
if( v.parent == parent )
if( parent != null && v.parent == parent )
add(v.name + (varId?"@" + v.id:""));
else
else {
add("var ");
addVarName(v);
}
add(" : ");
switch( v.type ) {
case TStruct(vl):
add("{");
var first = true;
for( v in vl ) {
for( childV in vl ) {
if( first ) first = false else add(", ");
addVar(v,v.kind,tabs,v);
addVar(childV,v.kind,tabs,v);
}
add("}");
default:
Expand Down
Loading