summaryrefslogtreecommitdiff
path: root/src/glsl
AgeCommit message (Collapse)Author
2010-09-01glsl: Convert constant record constructor parameters to ir_constants.Kenneth Graunke
I'm not sure if this is strictly necessary, but it seems wise.
2010-09-01glsl: Reject structure constructors that have too many arguments.Kenneth Graunke
Fixes piglit test constructor-27.vert.
2010-09-01glsl2: Remove unnecessary glsl_symbol_table::get_function parameter ↵Ian Romanick
return_constructors Now that constructors are not generated as functions or stored in the symbol table, there is no need to flag whether or not constructors should be returned.
2010-09-01glsl2: Remove unused method glsl_type::generate_constructorIan Romanick
2010-09-01glsl2: Remove unused 'constructor' parameter from glsl_symbol_table::add_typeIan Romanick
2010-09-01glsl2: Don't generate constructor functions for structuresIan Romanick
2010-09-01glsl2: Emit structure constructors inlineIan Romanick
Fixes piglit test cases glsl-[fv]s-all-0[12].
2010-09-01glsl: Fix write mask in matrix-from-matrix constructors.Kenneth Graunke
If the matrix being constructed was larger than the source matrix, it would overwrite the lower-right part of the matrix with the wrong values, rather than leaving it as the identity matrix. For example, constructing a mat4 from a mat2 should only use a writemask of "xy" when copying from the source, but was using "xyzw". Fixes the code generated by piglit test constructor-23.vert.
2010-09-01glsl: Add proper handling for constant matrix-from-matrix constructors.Kenneth Graunke
Fixes piglit test case constructor-21.vert and changes constructor-22.vert to give the correct output.
2010-09-01glsl: Move generate_constructor_(matrix|vector) to ir_constant ctor.Kenneth Graunke
2010-09-01ast_function: Fix check for "too few components".Kenneth Graunke
This was triggering even for matrix-from-matrix constructors. It is perfectly legal to construct a mat3 from a mat2 - the rest will be filled in by the identity matrix. Changes piglit test constructor-23.vert from FAIL to PASS, but the generated code is incorrect.
2010-09-01ast_function: Remove bogus cases from generate_constructor_matrix.Kenneth Graunke
There are no integer matrix types, so switching on them is silly.
2010-09-01glsl: Add forgotten implementations of equal/notEqual on bvecs.Kenneth Graunke
2010-09-01glsl2: Perform algebraic simplifications on logical binary operatorsIan Romanick
Reduces glsl-vs-all-01 from 42 Mesa IR instructions (including the END) to 17.
2010-09-01glsl2: Allow ir_constant::zero to create boolean constantsIan Romanick
2010-09-01glsl2: Disallow function declarations within function definitions in GLSL 1.20Ian Romanick
The GLSL 1.20 spec specifically disallows this, but it was allowed in GLSL 1.10. Fixes piglit test cases local-function-0[13].frag and bugzilla #29921.
2010-08-31glsl2: fix bug in atan(y, x) functionBrian Paul
When x==0, the result was wrong. Fixes piglit glsl-fs-atan-1.shader_test
2010-08-31glsl2: Write vector constructor constants in a single assignmentIan Romanick
Make two passes over the constructor parameters. Write all of the constants in a single write, then write the non-constants one at a time. This causes the fragment shader varying float g; void main() { gl_FragColor = vec4(0.0, g, 0.0, 1.0); } to generate (function main (signature void (parameters ) ( (declare (temporary ) vec4 vec_ctor@0x8580058) (assign (constant bool (1)) (xzw) (var_ref vec_ctor@0x8580058) (constant vec4 (0.000000 0.000000 0.000000 1.000000)) ) (assign (constant bool (1)) (y) (var_ref vec_ctor@0x8580058) (swiz xxxx (var_ref g@0x8580218) )) (assign (constant bool (1)) (xyzw) (var_ref gl_FragColor@0x84d32a0) (var_ref vec_ctor@0x8580058) ) )) ) instead of (function main (signature void (parameters ) ( (declare (temporary ) vec4 vec_ctor@0x8580058) (assign (constant bool (1)) (x) (var_ref vec_ctor@0x8580058) (constant vec4 (0.000000 0.000000 0.000000 1.000000)) ) (assign (constant bool (1)) (y) (var_ref vec_ctor@0x8580058) (swiz xxxx (var_ref g@0x8580218) )) (assign (constant bool (1)) (z) (var_ref vec_ctor@0x8580058) (constant vec4 (0.000000 0.000000 0.000000 1.000000)) ) (assign (constant bool (1)) (w) (var_ref vec_ctor@0x8580058) (constant vec4 (0.000000 0.000000 0.000000 1.000000)) ) (assign (constant bool (1)) (xyzw) (var_ref gl_FragColor@0x84d32a0) (var_ref vec_ctor@0x8580058) ) )) ) A similar optimization could be done for matrix constructors, but it is a little more complicate there.
2010-08-31ast_to_hir: Add support for bit-wise operators (but not shifts).Kenneth Graunke
Previously, using bit-wise operators in some larger expression would crash on a NULL pointer dereference. This code at least doesn't crash. Fixes piglit test bitwise-01.frag.
2010-08-30linker: Require an exact matching signature when looking for prototypes.Kenneth Graunke
Fixes piglit test glsl-override-builtin. The linker incorrectly found the prototype for the float signature, rather than adding a new prototype with the int return type. This caused ir_calls with type int to have their callees set to the float signature, triggering an assert.
2010-08-30linker: Handle varying arrays, matrices, and arrays of matricesIan Romanick
Fixes piglit test case glsl-array-varying-01.
2010-08-30glsl: Clear the static values of builtin function profiles at release.Eric Anholt
When releasing the builtin functions, we were just freeing the memory, not telling the builtin function loader that we had freed its memory. I wish I had done ARB_ES2_compatibility so we had regression testing of this path. Fixes segfault on changing video options in nexuiz.
2010-08-30glsl2: Commit generated files changed by previous commitIan Romanick
2010-08-30glsl2: Parse #pragma linesIan Romanick
All pragmas are currently ignored. Also, the error messages when a pragma is used incorrectly (i.e., '#pragma debug(on)' inside a function) are crap, but I think this is sufficient for now. Fixes piglit test cases pragma-0[1-8].(vert|frag).
2010-08-30glsl: Silence unused variable warning.José Fonseca
2010-08-29linker: Treat sized and unsized array types as the sameIan Romanick
If two shaders contain variables declared with array types that have the same base type but one is sized and the other is not, linking should succeed. I'm not super pleased with the way this is implemented, and I am more convinced than ever that we need more linker tests. We especially need "negative" tests. Fixes bugzilla #29697 and piglit test glsl-link-array-01.
2010-08-29glsl: Initialize data in ast_function_expression::hir.Vinson Lee
Completely initialize data that is passed to ir_constant constructor. Fixes piglit glsl-orangebook-ch06-bump valgrind uninitialized variable error on softpipe and llvmpipe.
2010-08-29glsl: Completely initialize value member in ir_constant constructor.Vinson Lee
The ir_constant::ir_constant(const struct glsl_type *type, exec_list *value_list) did not completely initialize the entire value member. Fixes piglit glsl-fs-sampler-numbering-2 valgrind uninitialized value error in softpipe and llvmpipe.
2010-08-29glsl: Initialize variable in ir_swizzle::constant_expression_value.Vinson Lee
Complete initialize data passed to ir_constant constructor. Fixes piglit glsl-mat-from-int-ctor-02 valgrind unintialized variable error with softpipe and llvmpipe.
2010-08-29glsl: Initialize data in read_constant.Vinson Lee
Completely initialize data that is passed into a ir_constant constructor. Fixes piglit glsl-fs-mix valgrind uninitialized variable error on softpipe and llvmpipe.
2010-08-28glsl: Initialize the rest of values of ir_constant::value.Vinson Lee
Fixes valgrind uninitialized value errors in the piglit shader tests for softpipe and llvmpipe.
2010-08-27glsl2: Decompose matrix comparison into vector operationsIan Romanick
2010-08-27glsl: Rename a couple of common variable names in mat_op_to_vec.Eric Anholt
It was easy while typing implementations to accidentally overwrite the original expression or assignment variables.
2010-08-27glsl: Make mat_op_to_vec allocate out of the IR's parent.Eric Anholt
This will reduce memory consumption of compiled shaders by not dragging optimized-out children around.
2010-08-27glsl: Regenerate for double destroy fix.Eric Anholt
2010-08-27glsl: Protect against double compiler-destroy.Eric Anholt
DRI was doing teardown when we close the last screen, then an atexit() was added to call it as well.
2010-08-27glsl2: restructure header file for C++ and C inclusionBrian Paul
As it was, the header could not be cleanly #included by a C source.
2010-08-27glsl2: remove 'extern' keyword in .c fileBrian Paul
2010-08-26glsl: Add a quick hack to constant folding to reduce duplicated work.Eric Anholt
Reduces runtime of glsl-max-varyings 92% on my system.
2010-08-26scons: Add glsl_symbol_table.cppJosé Fonseca
2010-08-26glsl2: Remove a couple FINISHME comments that have already been resolvedIan Romanick
2010-08-26glsl: Move built-ins to live beyond the global scope.Kenneth Graunke
Per the GLSL 1.20 specification (presumably a clarification of 1.10). Also, when creating user functions, make a new ir_function that shadows the built-in ir_function, rather than adding new signatures. User functions are supposed to hide built-ins, not overload them. Fixes piglit tests redeclaration-{04, 12, 14}.vert.
2010-08-26glsl: Move is_built_in flag from ir_function_signature to ir_function.Kenneth Graunke
Also rename it to "is_builtin" for consistency. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-08-26glsl: Refactor variable declaration handling.Kenneth Graunke
Moving the check for an earlier variable declaration helps cleanly separate out the re-declaration vs. new declaration code a bit. With that in place, conflicts between variable names and structure types or function names aren't caught by the earlier "redeclaration" error message, so check the return type on glsl_symbol_table::add_variable and issue an error there. If one occurs, don't emit the initializer. Fixes redeclaration-01.vert and redeclaration-09.vert. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-08-26glsl: Don't add overloads to existing structure constructors.Kenneth Graunke
Instead, make a new ir_function and try to add it to the symbol table. Fixes piglit test redeclaration-08.vert.
2010-08-26glsl: Remove name_declared_this_scope check when adding functions.Kenneth Graunke
Instead, rely on the symbol table's rules. Fixes redeclaration-02.vert.
2010-08-26glsl: Use a single shared namespace in the symbol table.Kenneth Graunke
As of 1.20, variable names, function names, and structure type names all share a single namespace, and should conflict with one another in the same scope, or hide each other in nested scopes. However, in 1.10, variables and functions can share the same name in the same scope. Structure types, however, conflict with/hide both. Fixes piglit tests redeclaration-06.vert, redeclaration-11.vert, redeclaration-19.vert, and struct-05.vert.
2010-08-26glsl2: Move ir_expression_flattening to using the rvalue visitor class.Eric Anholt
The previous implementation was missing handling of some rvalues, such as "if" conditions, leading to glsl-mat-int-from-ctor-* not getting caught.
2010-08-25glsl: Don't consider things with a type containing a sampler as an lvalue.Eric Anholt
We had ad-hoc handled some common cases by flagging sampler-typed variables as read_only, and rejected initializers of samplers. However, people could sneak them in in all sorts of surprising ways, like using whole-array or structure assignment. Fixes: glslparsertest/glsl2/sampler-01.frag glslparsertest/glsl2/sampler-03.frag glslparsertest/glsl2/sampler-04.frag glslparsertest/glsl2/sampler-06.frag Bug #27403.
2010-08-25glsl: fix crash with variable indexing into array in a structAras Pranckevicius
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>