diff options
| author | Michal Krol <mjkrol@gmail.org> | 2006-01-30 14:48:42 +0000 |
|---|---|---|
| committer | Michal Krol <mjkrol@gmail.org> | 2006-01-30 14:48:42 +0000 |
| commit | 9dc8bce88e84322171e16be190f2e430dee986ac (patch) | |
| tree | b9cdc26a56e1eb7847d457e8c91c498538838d4b /src/mesa/shader/slang/slang_assemble_constructor.c | |
| parent | b2006a40eb22899d38cd31691640555228e36975 (diff) | |
Split slang_compile.c into several smaller files - it was just too big.
Minor fixes and cosmetic changes.
Diffstat (limited to 'src/mesa/shader/slang/slang_assemble_constructor.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_assemble_constructor.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/shader/slang/slang_assemble_constructor.c b/src/mesa/shader/slang/slang_assemble_constructor.c index 76a30f6b6c..e62f88b591 100644 --- a/src/mesa/shader/slang/slang_assemble_constructor.c +++ b/src/mesa/shader/slang/slang_assemble_constructor.c @@ -1,8 +1,8 @@ /*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.5
*
- * Copyright (C) 2005 Brian Paul All Rights Reserved.
+ * Copyright (C) 2005-2006 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -158,7 +158,8 @@ static int constructor_aggregate (slang_assembly_file *file, const slang_storage goto end1;
slang_storage_aggregate_construct (&agg);
- if (!(result = _slang_aggregate_variable (&agg, &ti.spec, NULL, space->funcs, space->structs)))
+ if (!(result = _slang_aggregate_variable (&agg, &ti.spec, NULL, space->funcs, space->structs,
+ space->vars)))
goto end2;
slang_storage_aggregate_construct (&flat_agg);
@@ -205,7 +206,8 @@ int _slang_assemble_constructor (slang_assembly_file *file, slang_operation *op, goto end1;
slang_storage_aggregate_construct (&agg);
- if (!(result = _slang_aggregate_variable (&agg, &ti.spec, NULL, space->funcs, space->structs)))
+ if (!(result = _slang_aggregate_variable (&agg, &ti.spec, NULL, space->funcs, space->structs,
+ space->vars)))
goto end2;
size = _slang_sizeof_aggregate (&agg);
|