diff options
author | Michal Krol <mjkrol@gmail.org> | 2006-02-21 12:35:06 +0000 |
---|---|---|
committer | Michal Krol <mjkrol@gmail.org> | 2006-02-21 12:35:06 +0000 |
commit | cc1591667d55a6dbfafbd3d6a7afa9f9288c625d (patch) | |
tree | a3ef92d3a8667e830c94db9441089dbadb45e31a /src/mesa/shader/slang/slang_assemble_assignment.c | |
parent | 8986e36f368d11bcf3f1938d77b5df69aa2ee11b (diff) |
More GLSL code:
- uniforms (only GetLocation, Uniform1f and Uniform4fv for now for demos);
- fix bugs and optimize array size handling;
- 2D texture sampling (needs Enable(TEXTURE_2D) to work);
- decrease built-in library assembly size by 30%.
Diffstat (limited to 'src/mesa/shader/slang/slang_assemble_assignment.c')
-rw-r--r-- | src/mesa/shader/slang/slang_assemble_assignment.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/shader/slang/slang_assemble_assignment.c b/src/mesa/shader/slang/slang_assemble_assignment.c index 186c4886f7..d4799b05be 100644 --- a/src/mesa/shader/slang/slang_assemble_assignment.c +++ b/src/mesa/shader/slang/slang_assemble_assignment.c @@ -127,12 +127,12 @@ GLboolean _slang_assemble_assignment (slang_assemble_ctx *A, slang_operation *op if (!slang_assembly_typeinfo_construct (&ti))
return GL_FALSE;
- if (!_slang_typeof_operation (op, &A->space, &ti, A->atoms))
+ if (!_slang_typeof_operation (A, op, &ti))
goto end1;
if (!slang_storage_aggregate_construct (&agg))
goto end1;
- if (!_slang_aggregate_variable (&agg, &ti.spec, NULL, A->space.funcs, A->space.structs,
+ if (!_slang_aggregate_variable (&agg, &ti.spec, 0, A->space.funcs, A->space.structs,
A->space.vars, A->mach, A->file, A->atoms))
goto end;
@@ -167,10 +167,10 @@ GLboolean _slang_assemble_assign (slang_assemble_ctx *A, slang_operation *op, co if (slang_string_compare ("=", oper) == 0)
{
- if (!_slang_assemble_operation_ (A, &op->children[0], slang_ref_force))
+ if (!_slang_assemble_operation (A, &op->children[0], slang_ref_force))
return GL_FALSE;
swz = A->swz;
- if (!_slang_assemble_operation_ (A, &op->children[1], slang_ref_forbid))
+ if (!_slang_assemble_operation (A, &op->children[1], slang_ref_forbid))
return GL_FALSE;
A->swz = swz;
if (!_slang_assemble_assignment (A, op->children))
|