summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* glsl2: add gl_LightModel built-in uniform.Aras Pranckevicius2010-08-041-0/+1
|
* glsl2: Don't try to assign locations for samplers during linking.Eric Anholt2010-08-041-0/+3
| | | | | | Mesa will do the mapping at _mesa_add_sampler() time. Fixes assertion failures in debug builds, which might have caught real problems with multiple samplers linked in a row.
* ir_to_mesa: Clean up the mapping of samplers to Mesa's sampler uniforms.Eric Anholt2010-08-041-20/+22
| | | | | | Instead of using a linker-assigned location (since samplers don't actually take up uniform space, being a link-time choice), use the sampler's varaible pointer as a hash key.
* mesa: Don't null deref looking for Mesa IR code at compile time.Eric Anholt2010-08-041-5/+3
| | | | | | | The new compiler doesn't generate Mesa IR at compile time, and that compile time code previously wouldn't have reflected the link time code that actually got used. But do dump the info log of the compile regardless.
* glsl2: Skip talloc_parent in constant_expression of non-constant arrays.Eric Anholt2010-08-042-2/+2
|
* glsl2: Make the clone() method take a talloc context.Eric Anholt2010-08-049-131/+130
| | | | | | | In most cases, we needed to be reparenting the cloned IR to a different context (for example, to the linked shader instead of the unlinked shader), or optimization before the reparent would cause memory usage of the original object to grow and grow.
* glsl2: Set ir_discard::ir_type when cloning itAras Pranckevicius2010-08-041-0/+1
| | | | Fixes unset ir_type after inlining.
* glsl2: Fix ir_validate validating null variable names.Eric Anholt2010-08-031-1/+2
| | | | | | | | | An unnamed variable in a prototype will have a NULL ->name, so don't worry about storage then. Fixes: CorrectFunction1.vert CorrectParse1.frag
* glsl2: No need to strdup the name passed in to ir_variable constructor.Eric Anholt2010-08-031-13/+5
| | | | | ir_variable always strdups the incoming name so that it matches the lifetime of the ir_variable.
* glsl2: Fix typo in clamp() constant builtin using uint instead of int.Eric Anholt2010-08-021-1/+1
| | | | | I take back the bad things I've said about the signed/unsigned comparison warning now.
* ir_to_mesa: Add support for 1.20 uniform initializers.Eric Anholt2010-08-021-30/+97
| | | | | | | | | Fixes: glsl-uniform-initializer-1 glsl-uniform-initializer-2 glsl-uniform-initializer-3 glsl-uniform-initializer-4 glsl1-GLSL 1.20 uniform array constructor
* glsl2: Don't consider uniform initializers as constant expressions.Eric Anholt2010-08-021-0/+6
| | | | | We were happily optimizing away the body of glsl-uniform-initializer-* to never use the uniforms.
* Initialize a couple of HasIndex2 fields on Mesa IR src regs.Eric Anholt2010-08-022-0/+2
|
* ir_to_mesa: Support for struct uniforms.Eric Anholt2010-08-021-0/+78
| | | | Fixes glsl-uniform-struct.
* ir_to_mesa: Add a constructor for ir_to_mesa_src_reg.Eric Anholt2010-08-021-48/+34
| | | | | This helps makes sure we don't miss any new fields, and makes totally uninitialized src_regs be PROGRAM_UNDEFINED.
* glsl2: Use talloc_zero_size instead of talloc_size to allocate ast_node objects.Carl Worth2010-08-021-1/+1
| | | | | | This is a zero-ing function, (like calloc), to avoid bugs due to accessing uninitialized values. Thanks to valgrind for noticing the use of uninitialized values.
* glsl_type: Use string key for array type hashIan Romanick2010-08-022-40/+12
|
* Keep a local copy of the symbol name in the symbol tableIan Romanick2010-08-021-3/+4
| | | | | | | | | | | | | | | | | | | | | The symbol_header structure that tracks symbols with a particular name may have a different (longer) life time than the symbols it tracks. Not keeping a local copy of the name can lead to use-after-free errors. For example, the following sequence would trigger such an error: char *copy = strdup(name); _mesa_symbol_table_push_scope(st); _mesa_symbol_table_add_symbol(st, 0, name, NULL); _mesa_symbol_table_pop_scope(st); free(name); _mesa_symbol_table_find_symbol(st, 0, copy); With this change, the symbol table keeps a local copy of the name that has the same life time as the symbol_header for that name. This resolves some use-after-free errors with built-in functions in the GLSL compiler.
* glsl2: Clean-up two 'unused variable' warningsIan Romanick2010-08-022-0/+5
|
* glsl2: Make glsl_types::ctx private againIan Romanick2010-08-022-3/+5
|
* glsl2: Fix expression type in builtin tan().Eric Anholt2010-08-022-6/+6
| | | | Fixes glsl-fs-tan-1.
* glsl2: Add validation that talloc ownership of ir_* names is right.Eric Anholt2010-08-021-1/+3
|
* glsl2: Fix validation for ir_unop_not.Eric Anholt2010-08-021-2/+2
| | | | We use vector ir_unop_not to implement builtin not(), and that seems fine.
* glsl2: Add support for floating constants like "1f".Eric Anholt2010-08-022-426/+438
| | | | Fixes glsl-floating-constant-120.
* glsl2: Initialize the ARB_fcc fields of ir_variable.Eric Anholt2010-08-021-0/+2
| | | | Fixes intermittent failure in glsl-arb-fragment-coord-conventions.
* glsl2: Also initialize the identifier field of parameter_declarator.Eric Anholt2010-08-021-0/+1
| | | | | | The non-named parameter grammar understandably doesn't set the identifier field. Fixes intermittent failures about void main(void) {} having a named void parameter.
* glsl2: Fix spelling of "precision" in error output.Eric Anholt2010-08-022-6/+6
|
* glsl2: Don't add mesa/program/ as an include dir. Let includes say program/.Eric Anholt2010-08-021-1/+0
|
* glsl2: Give the path within src/mesa/ for headers instead of relying on -I.Aras Pranckevicius2010-08-029-9/+9
|
* glsl2: initialize is_array and array_size of ast_parameter_declaratorAras Pranckevicius2010-08-021-0/+6
| | | | The non-array path of glsl_parser.ypp wasn't setting is_array to false.
* glsl2: Make non-square matrix keywords not keywords pre-120.Eric Anholt2010-08-012-313/+207
| | | | Fixes glsl-mat-110.
* ir_to_mesa: Add support for MESA_GLSL=log.Eric Anholt2010-08-011-0/+4
| | | | | This is the option that dumps shader source to files in the current directory.
* glcpp: Add a testcase for the failure in compiling xonotic's shader.Eric Anholt2010-08-012-0/+9
| | | | gcc and mesa master agree that this is OK.
* glsl2: Do algebraic optimizations after linking as well.Eric Anholt2010-07-311-0/+1
| | | | | Linking brings in inlining of builtins, so we weren't catching the (rcp(/sqrt(x)) -> rsq(x)) without it.
* glsl2: Add new tree grafting optimization pass.Eric Anholt2010-07-316-0/+361
|
* glsl2: Factor out the variable refcounting part of ir_dead_code.cpp.Eric Anholt2010-07-314-112/+190
|
* glsl2: Fix stack smash when ternary selection is used.Aras Pranckevicius2010-07-311-1/+1
|
* glsl2: Fix the implementation of atan(y, x).Eric Anholt2010-07-302-166/+166
| | | | | | | | | | | | | | | | So many problems here. One is that we can't do the quadrant handling for all the channels at the same time, so we call the float(y, x) version multiple times. I'd also left out the x == 0 handling. Also, the quadrant handling was broken for y == 0, so there was a funny discontinuity on the +x side if you plugged in obvious values to test. I generated the atan(float y, float x) code from a short segment of GLSL and pasted it in by hand. It would be nice to automate that somehow. Fixes: glsl-fs-atan-1 glsl-fs-atan-2
* ast: Initialize location data in constructor of all ast_node objects.Carl Worth2010-07-301-1/+3
| | | | | | This prevents using uninitialized data in _msea_glsl_error in some cases, (including at least 6 piglit tests). Thanks to valgrind for pointing out the problem!
* ir_to_mesa: Add the function name as a comment to BGNSUB and ENDSUB.Eric Anholt2010-07-301-4/+18
|
* glsl2: Update the callee pointer of calls to newly-linked-in functions.Eric Anholt2010-07-301-0/+2
| | | | | | Otherwise, ir_function_inlining will see the body of the function from the unlinked version of the shader, which won't have had the lowering passes done on it or linking's variable remapping.
* glsl2: Initialize ir_function_signature::is_built_in.Kenneth Graunke2010-07-301-0/+1
| | | | Fixes a valgrind error.
* glcpp: Don't look for backslashes before the beginning of the string.Kenneth Graunke2010-07-301-3/+7
| | | | Fixes a valgrind error.
* glsl2: Do ir_if_return on the way out, not the way in.Eric Anholt2010-07-291-19/+20
| | | | | | | | | | | | | | | The problem with doing it on the way in is that for a function with multiple early returns, we'll move an outer block in, then restart the pass, then move the two inside returns out, then never move outer blocks in again because the remaining early returns are inside an else block and they don't know that there's a return just after their block. By going inside-out, we get the early returns stacked up so that they all move out with a series of move_returns_after_block(). Fixes (on i965): glsl-fs-raytrace-bug27060 glsl-vs-raytrace-bug26691
* glsl2: Make sure functions end with a return before doing ir_if_return.Eric Anholt2010-07-291-1/+61
| | | | | | | | | This catches a few remaining functions that weren't getting inlined, generally operating on global or out variables and using an early return to skip work when possible. Fixes for i965: glsl1-function with early return (3)
* glsl2: Make ir_if_return handle if () { return } else { not return }Eric Anholt2010-07-291-26/+77
| | | | | | | | This makes many remaining functions inlinable. Fixes for i965: glsl1-function with early return (1) glsl1-function with early return (2)
* glsl2: Refactor a bit of ir_if_return for the next changes.Eric Anholt2010-07-291-22/+34
|
* ir_to_mesa: Don't emit a duplicate return at the end of a function.Eric Anholt2010-07-291-2/+6
| | | | It was harmless, but ugly.
* glsl2: Allow use of _mesa_print_ir without a parse state on hand.Eric Anholt2010-07-291-10/+12
|
* ir_constant_variable: Don't mark variable from outside our scope as constant.Eric Anholt2010-07-291-1/+20
| | | | | Fixes (with software, except for alpha): glsl1-function with early return(3)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 14:22:23 +0000