summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/program_parse.y
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2009-08-20 18:29:41 -0700
committerIan Romanick <[email protected]>2009-08-20 18:29:41 -0700
commitac5551fbb97dd668f0c96c334d23b1fc48d16e18 (patch)
treec9d91f7cf11a8d5b432c696eedc63adcfd12bf81 /src/mesa/shader/program_parse.y
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/program_parse.y')
-rw-r--r--src/mesa/shader/program_parse.y16
1 files changed, 8 insertions, 8 deletions
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;
}
;