mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GLSL: Fix #1229: merge array sizes in parameter declarations.

Browse Source
This commit is contained in:
John Kessenich
2018-02-02 12:39:47 -07:00
parent 98e733cb58
commit b3f9e0a334
5 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/MachineIndependent/glslang_tab.cpp
View File

@@ -4433,9 +4433,9 @@ yyreduce:
parseContext.arraySizeRequiredCheck((yyvsp[0].interm).loc, *(yyvsp[0].interm).arraySizes);
parseContext.reservedErrorCheck((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string);
(yyvsp[-2].interm.type).arraySizes = (yyvsp[0].interm).arraySizes;
TParameter param = { (yyvsp[-1].lex).string, new TType((yyvsp[-2].interm.type))};
parseContext.arrayDimMerge(*param.type, (yyvsp[0].interm).arraySizes);
(yyval.interm).loc = (yyvsp[-1].lex).loc;
(yyval.interm).param = param;
}