summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* glsl2: Add a pass for removing unused functions.Eric Anholt2010-08-056-1/+160
| | | | | | | | | For a shader involving many small functions, this avoids running optimization across all of them after they've been inlined post-linking. Reduces the runtime of linking and running a fragment shader from Yo Frankie from 1.6 seconds to 0.9 seconds (-44.9%, +/- 3.3%).
* glsl2: Catch pointless copies in copy propagation.Eric Anholt2010-08-051-5/+17
| | | | | | | | | We wouldn't want to go rewriting dereferences to variables to point at the same variable it did before. While I didn't find a way to trigger that, a shader in Yo Frankie managed to produce a self-assignment by passing a constant to a function doing self assignment like this. Cleans up the IR for glsl-deadcode-self-assign.shader_test
* glsl2: Don't try to dump GLSL IR for a shader that didn't compile.Eric Anholt2010-08-051-3/+5
|
* ir_to_mesa: Remove debug force-enablement of EmitNoIfs.Eric Anholt2010-08-051-1/+1
|
* glcpp: Ignore #if and #elif expressions when skipping.Kenneth Graunke2010-08-042-96/+124
| | | | | Fixes glcpp test cases 073 and 074, as well as piglit test xonotic-vs-generic-diffuse.vert.
* glcpp/tests: Add a corollary to testcase 073 for testing #elif.Kenneth Graunke2010-08-041-0/+3
|
* glcpp/tests: Fix 073-if-in-ifdef.c to use #ifdef, not #if.Kenneth Graunke2010-08-041-1/+1
| | | | The original intention was to use #ifdef.
* glcpp: Refactor HASH_IF and HASH_ELIF expansion to reuse code.Kenneth Graunke2010-08-042-144/+142
|
* glsl2: Remove the shader_in/shader_out tracking separate from var->mode.Eric Anholt2010-08-047-57/+17
| | | | | | | | | | | | | | | I introduced this for ir_dead_code to distinguish function parameter outvals from varying outputs. Only, since ast_to_hir's current_function is unset when setting up function parameters (they're needed for making the function signature in the first place), all function parameter outvals were marked as shader outputs anyway. This meant that an inlined function's cloned outval was marked as a shader output and couldn't be dead-code eliminated. Instead, since ir_dead_code doesn't even look at function parameters, just use var->mode. The longest Mesa IR coming out of ir_to_mesa for Yo Frankie drops from 725 instructions to 636.
* glsl2: Remove a dead cut and paste member from ir_variable_refcount_visitor.Eric Anholt2010-08-041-2/+0
|
* i965: Settle on printing our program debug to stdout.Eric Anholt2010-08-045-26/+34
| | | | | | Mixing stderr (_mesa_print_program, _mesa_print_instruction, _mesa_print_alu) with stdout means that when writing both to a file, there isn't a consistent ordering between the two.
* ir_to_mesa: Print shader source and compiled IR under MESA_GLSL=dump.Eric Anholt2010-08-041-1/+17
| | | | | | | While the Mesa IR dumping includes some corresponding GLSL IR for correlating Mesa IR to GLSL IR, it doesn't completely express it. This printing includes things like variable declarations and control flow structure that is hard to read otherwise.
* glsl2: Use linked ir_constant_variable after linking, instead of unlinked.Eric Anholt2010-08-041-1/+1
|
* glsl2: Return progress from ir_vec_index_to_swizzle.Eric Anholt2010-08-041-1/+1
|
* glsl2: Generate masked assignments in some expanded matrix operationsIan Romanick2010-08-041-5/+10
|
* glsl2: Generate masked assignments in vector and matrix constructorsIan Romanick2010-08-041-36/+46
| | | | | | | Previously the in-line matrix and vector constructors would generate swizzles in the LHS. The code is actually more clear if it just generates the masked assignments instead of relying on the ir_assignment constructor to convert the swizzles to write masks.
* glsl2: Additional validation of write masksIan Romanick2010-08-041-0/+32
|
* glsl2: Add ir_assignment::write_mask and associated methodsIan Romanick2010-08-0410-52/+199
| | | | | | | | | | | | | | | | | | | | | | | Replace swizzles on the LHS with additional swizzles on the RHS and a write mask in the assignment instruction. As part of this add ir_assignment::set_lhs. Ideally we'd make ir_assignment::lhs private to prevent erroneous writes, but that would require a lot of code butchery at this point. Add ir_assignment constructor that takes an explicit write mask. This is required for ir_assignment::clone, but it can also be used in other places. Without this, ir_assignment clones lose their write masks, and incorrect IR is generated in optimization passes. Add ir_assignment::whole_variable_written method. This method gets the variable on the LHS if the whole variable is written or NULL otherwise. This is different from ir->lhs->whole_variable_referenced() because the latter has no knowledge of the write mask stored in the ir_assignment. Gut all code from ir_to_mesa that handled swizzles on the LHS of assignments. There is probably some other refactoring that could be done here, but that can be left for another day.
* glsl2: Don't try to construct an ir_assignment with an invalid LHSIan Romanick2010-08-041-3/+2
|
* glsl2: Constant fold the children of many more ir_instruction types.Eric Anholt2010-08-041-7/+32
|
* glsl2: Return a real progress value from constant folding.Eric Anholt2010-08-041-3/+6
|
* glsl2: Refactor constant folding of rvalues to a function.Eric Anholt2010-08-041-26/+21
|
* glcpp: Refresh autogenerated lexer and parser.Kenneth Graunke2010-08-043-155/+148
|
* glcpp: Remove xtalloc wrappers in favor of plain talloc.Kenneth Graunke2010-08-046-153/+28
| | | | | | Calling exit() on a memory failure probably made sense for the standalone preprocessor, but doesn't seem too appealing as part of the GL library. Also, we don't use it in the main compiler.
* glsl2: Remove uses of deprecated TALLOC_CTX type.Kenneth Graunke2010-08-043-25/+25
|
* 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 14:28:49 +0000