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%.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mesa/shader/slang/slang_assemble_constructor.c b/src/mesa/shader/slang/slang_assemble_constructor.c
index d7d2e422d3..278d490d9d 100644
--- a/src/mesa/shader/slang/slang_assemble_constructor.c
+++ b/src/mesa/shader/slang/slang_assemble_constructor.c
@@ -155,12 +155,12 @@ static GLboolean constructor_aggregate (slang_assemble_ctx *A, const slang_stora
 

 	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 end2;

 

@@ -169,7 +169,7 @@ static GLboolean constructor_aggregate (slang_assemble_ctx *A, const slang_stora
 	if (!_slang_flatten_aggregate (&flat_agg, &agg))

 		goto end;

 

-	if (!_slang_assemble_operation_ (A, op, slang_ref_forbid))

+	if (!_slang_assemble_operation (A, op, slang_ref_forbid))

 		goto end;

 

 	for (i = 0; i < flat_agg.count; i++)

@@ -205,13 +205,13 @@ GLboolean _slang_assemble_constructor (slang_assemble_ctx *A, slang_operation *o
 	/* get typeinfo of the constructor (the result of constructor expression) */

 	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;

 

 	/* create an aggregate of the constructor */

 	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 end2;