diff options
| -rw-r--r-- | src/mesa/shader/program_parse.tab.c | 16 | ||||
| -rw-r--r-- | src/mesa/shader/program_parse.y | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c index 856bcbe874..dbed448113 100644 --- a/src/mesa/shader/program_parse.tab.c +++ b/src/mesa/shader/program_parse.tab.c @@ -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; diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y index b4ba5b03f0..89e8850212 100644 --- a/src/mesa/shader/program_parse.y +++ b/src/mesa/shader/program_parse.y @@ -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; } ; |