summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/program_parse.y
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2009-07-24 18:01:59 -0700
committerIan Romanick <[email protected]>2009-07-24 18:01:59 -0700
commitf3cba9d66a5b45f4afeda3763f9ec1fb53e2ec89 (patch)
tree0eae76e37c792d9bacbd8bfc3b83a4d180e6fad1 /src/mesa/shader/program_parse.y
parent6f8214cae613bc3bead215214e092c07793975e7 (diff)
ARB prog parse: Fix cut-and-paste error for constant vectors
Diffstat (limited to 'src/mesa/shader/program_parse.y')
-rw-r--r--src/mesa/shader/program_parse.y12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 93fc91c581c..8521a97b4f8 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -1513,12 +1513,17 @@ paramConstVector: '{' signedFloatConstant '}'
{
$$.count = 1;
$$.data[0] = $2;
+ $$.data[1] = 0.0f;
+ $$.data[2] = 0.0f;
+ $$.data[3] = 0.0f;
}
| '{' signedFloatConstant ',' signedFloatConstant '}'
{
$$.count = 2;
$$.data[0] = $2;
$$.data[1] = $4;
+ $$.data[2] = 0.0f;
+ $$.data[3] = 0.0f;
}
| '{' signedFloatConstant ',' signedFloatConstant ','
signedFloatConstant '}'
@@ -1526,7 +1531,8 @@ paramConstVector: '{' signedFloatConstant '}'
$$.count = 3;
$$.data[0] = $2;
$$.data[1] = $4;
- $$.data[1] = $6;
+ $$.data[2] = $6;
+ $$.data[3] = 0.0f;
}
| '{' signedFloatConstant ',' signedFloatConstant ','
signedFloatConstant ',' signedFloatConstant '}'
@@ -1534,8 +1540,8 @@ paramConstVector: '{' signedFloatConstant '}'
$$.count = 4;
$$.data[0] = $2;
$$.data[1] = $4;
- $$.data[1] = $6;
- $$.data[1] = $8;
+ $$.data[2] = $6;
+ $$.data[3] = $8;
}
;