OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARB prog parser: Revert part of previous change to constant parsing

Browse Source 
The commit "ARP prog parser: Implement the spec, not what makes sense"
broke the parsing of scalar constants.  This commit reverts that part
of that commit.  Now vp_swizzle.c passes.
This commit is contained in:
Ian Romanick
2009-08-20 18:29:41 -07:00
parent a512985fd8
commit ac5551fbb9
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesa/shader/program_parse.tab.c
View File

@@ -4092,11 +4092,11 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 1643 "program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).count = 1;
(yyval.vector).data[0] = (yyvsp[(1) - (1)].real);
(yyval.vector).data[1] = 0.0f;
(yyval.vector).data[2] = 0.0f;
(yyval.vector).data[3] = 1.0f;
(yyval.vector).data[1] = (yyvsp[(1) - (1)].real);
(yyval.vector).data[2] = (yyvsp[(1) - (1)].real);
(yyval.vector).data[3] = (yyvsp[(1) - (1)].real);
;}
break;
@@ -4105,11 +4105,11 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 1651 "program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).count = 1;
(yyval.vector).data[0] = (float) (yyvsp[(1) - (1)].integer);
(yyval.vector).data[1] = 0.0f;
(yyval.vector).data[2] = 0.0f;
(yyval.vector).data[3] = 1.0f;
(yyval.vector).data[1] = (float) (yyvsp[(1) - (1)].integer);
(yyval.vector).data[2] = (float) (yyvsp[(1) - (1)].integer);
(yyval.vector).data[3] = (float) (yyvsp[(1) - (1)].integer);
;}
break;

16
src/mesa/shader/program_parse.y
View File

@@ -1641,19 +1641,19 @@ paramConstScalarDecl: signedFloatConstant
paramConstScalarUse: REAL
{
$$.count = 4;
$$.count = 1;
$$.data[0] = $1;
$$.data[1] = 0.0f;
$$.data[2] = 0.0f;
$$.data[3] = 1.0f;
$$.data[1] = $1;
$$.data[2] = $1;
$$.data[3] = $1;
}
| INTEGER
{
$$.count = 4;
$$.count = 1;
$$.data[0] = (float) $1;
$$.data[1] = 0.0f;
$$.data[2] = 0.0f;
$$.data[3] = 1.0f;
$$.data[1] = (float) $1;
$$.data[2] = (float) $1;
$$.data[3] = (float) $1;
}
;