summaryrefslogtreecommitdiff
path: root/src/mesa/shader
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2009-08-20 18:29:41 -0700
committerIan Romanick <ian.d.romanick@intel.com>2009-08-20 18:29:41 -0700
commitac5551fbb97dd668f0c96c334d23b1fc48d16e18 (patch)
treec9d91f7cf11a8d5b432c696eedc63adcfd12bf81 /src/mesa/shader
parenta512985fd81c1ed4ccc5e69aaa05015cf7ff844d (diff)
ARB prog parser: Revert part of previous change to constant parsing
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.
Diffstat (limited to 'src/mesa/shader')
-rw-r--r--src/mesa/shader/program_parse.tab.c16
-rw-r--r--src/mesa/shader/program_parse.y16
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 856bcbe874a..dbed448113e 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 b4ba5b03f0e..89e88502121 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;
}
;