summaryrefslogtreecommitdiff
path: root/src/glsl
AgeCommit message (Collapse)Author
2010-09-22glsl: Fix copy'n'wasted ir_noop_swizzle conditions.Eric Anholt
It considered .xyyy a noop for vec4 instead of .xyzw, and similar for vec3.
2010-09-22glsl: Rework assignments with write_masks to have LHS chan count match RHS.Eric Anholt
It turns out that most people new to this IR are surprised when an assignment to (say) 3 components on the LHS takes 4 components on the RHS. It also makes for quite strange IR output: (assign (constant bool (1)) (x) (var_ref color) (swiz x (var_ref v) )) (assign (constant bool (1)) (y) (var_ref color) (swiz yy (var_ref v) )) (assign (constant bool (1)) (z) (var_ref color) (swiz zzz (var_ref v) )) But even worse, even we get it wrong, as shown by this line of our current step(float, vec4): (assign (constant bool (1)) (w) (var_ref t) (expression float b2f (expression bool >= (swiz w (var_ref x))(var_ref edge)))) where we try to assign a float to the writemasked-out x channel and don't supply anything for the actual w channel we're writing. Drivers right now just get lucky since ir_to_mesa spams the float value across all the source channels of a vec4. Instead, the RHS will now have a number of components equal to the number of components actually being written. Hopefully this confuses everyone less, and it also makes codegen for a scalar target simpler. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2010-09-21glsl2: fix typo in error msgBrian Paul
2010-09-21glsl: Add definition of gl_TextureMatrix inverse/transpose builtins.Eric Anholt
Fixes glsl2/builtin-texturematrix. Bug #30196.
2010-09-20glsl: Fix broken handling of ir_binop_equal and ir_binop_nequal.Kenneth Graunke
When ir_binop_all_equal and ir_binop_any_nequal were introduced, the meaning of these two opcodes changed to return vectors rather than a single scalar, but the constant expression handling code was incorrectly written and only worked for scalars. As a result, only the first component of the returned vector would be properly initialized.
2010-09-20glsl: Add comments to clarify the types of comparison binops.Kenneth Graunke
2010-09-20glsl2: silence compiler warnings in printf() callsBrian Paul
Such as: "ir_validate.cpp:143: warning: format ‘%p’ expects type ‘void*’, but argument 2 has type ‘ir_variable*’"
2010-09-20glsl: Add doxygen commentsIan Romanick
2010-09-18glsl/builtins: Switch comparison functions to just return an expression.Kenneth Graunke
2010-09-18glsl/builtins: Fix equal and notEqual builtins.Kenneth Graunke
Commit 309cd4115b7cba669a0bf858e7809cb6dae90ddf incorrectly converted these to all_equal and any_nequal, which is the wrong operation.
2010-09-18glsl: Properly handle nested structure types.Kenneth Graunke
Fixes piglit test CorrectFull.frag.
2010-09-18glsl2: Fixed cloning of ir_call error instructions.Tilman Sauerbeck
Those have the callee field set to the null pointer, so calling the public constructor will segfault. Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
2010-09-18glsl: Fix 'control reaches end of non-void function' warning.Vinson Lee
Fixes this GCC warning. lower_variable_index_to_cond_assign.cpp: In member function 'bool variable_index_to_cond_assign_visitor::needs_lowering(ir_dereference_array*) const': lower_variable_index_to_cond_assign.cpp:261: warning: control reaches end of non-void function
2010-09-18glsl2: Empty functions can be inlined.Tilman Sauerbeck
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2010-09-17glsl2: Add flags to enable variable index loweringIan Romanick
2010-09-17glsl2: Refactor testing for whether a deref is of a matrix or arrayIan Romanick
2010-09-17glsl: add pass to lower variable array indexing to conditional assignmentsLuca Barbieri
Currenly GLSL happily generates indirect addressing of any kind of arrays. Unfortunately DirectX 9 GPUs are not guaranteed to support any of them in general. This pass fixes that by lowering such constructs to a binary search on the values, followed at the end by vectorized generation of equality masks, and 4 conditional assignments for each mask generation. Note that this requires the ir_binop_equal change so that we can emit SEQ to generate the boolean masks. Unfortunately, ir_structure_splitting is too dumb to turn the resulting constant array references to individual variables, so this will need to be added too before this pass can actually be effective for temps. Several patches in the glsl2-lower-variable-indexing were squashed into this commit. These patches fix bugs in Luca's original implementation, and the individual patches can be seen in that branch. This was done to aid bisecting in the future. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-09-16glsl: Don't print blank (function ...) headers for built-ins.Kenneth Graunke
Fixes a regression caused when I added my GLSL ES support.
2010-09-16glsl: Change from has_builtin_signature to has_user_signature.Kenneth Graunke
The print visitor needs this, and the only existing user can work with has_user_signature just as well.
2010-09-15glsl: Fix 'format not a string literal and no format arguments' warning.Vinson Lee
Fix the following GCC warning. loop_controls.cpp: In function 'int calculate_iterations(ir_rvalue*, ir_rvalue*, ir_rvalue*, ir_expression_operation)': loop_controls.cpp:88: warning: format not a string literal and no format arguments
2010-09-14glsl2: add case for ir_unop_noiseBrian Paul
Silences a compiler warning. Still need to add some assertions for this case.
2010-09-14glsl2: fix commentsBrian Paul
2010-09-13glsl2: Port equal() and notEqual() to ir_unop_all_equal and ir_unop_any_nequalIan Romanick
2010-09-13glsl: introduce ir_binop_all_equal and ir_binop_any_equal, allow vector cmpsLuca Barbieri
Currently GLSL IR forbids any vector comparisons, and defines "ir_binop_equal" and "ir_binop_nequal" to compare all elements and give a single bool. This is highly unintuitive and prevents generation of optimal Mesa IR. Hence, first rename "ir_binop_equal" to "ir_binop_all_equal" and "ir_binop_nequal" to "ir_binop_any_nequal". Second, readd "ir_binop_equal" and "ir_binop_nequal" with the same semantics as less, lequal, etc. Third, allow all comparisons to acts on vectors. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-09-13loop_unroll: unroll loops with (lowered) breaksLuca Barbieri
If the loop ends with an if with one break or in a single break unroll it. Loops that end with a continue will have that continue removed by the redundant jump optimizer. Likewise loops that end with an if-statement with a break at the end of both branches will have the break pulled out after the if-statement. Loops of the form for (...) { do_something1(); if (cond) { do_something2(); break; } else { do_something3(); } } will be unrolled as do_something1(); if (cond) { do_something2(); } else { do_something3(); do_something1(); if (cond) { do_something2(); } else { do_something3(); /* Repeat inserting iterations here.*/ } } ir_lower_jumps can guarantee that all loops are put in this form and thus all loops are now potentially unrollable if an upper bound on the number of iterations can be found. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-09-13glsl2: Add pass to remove redundant jumpsIan Romanick
2010-09-13glsl: Explain file naming conventionIan Romanick
2010-09-13loop_controls: fix analysis of already analyzed loopsLuca Barbieri
The loop_controls pass didn't look at the counter values it put in ir_loop on previous iterations, so while the first iteration worked, subsequent ones couldn't determine max_iterations.
2010-09-13glsl: add continue/break/return unification/elimination pass (v2)Luca Barbieri
Changes in v2: - Base class renamed to ir_control_flow_visitor - Tried to comply with coding style This is a new pass that supersedes ir_if_return and "lowers" jumps to if/else structures. Currently it causes no regressions on softpipe and nv40, but I'm not sure whether the piglit glsl tests are thorough enough, so consider this experimental. It can be asked to: 1. Pull jumps out of ifs where possible 2. Remove all "continue"s, replacing them with an "execute flag" 3. Replace all "break" with a single conditional one at the end of the loop 4. Replace all "return"s with a single return at the end of the function, for the main function and/or other functions This gives several great benefits: 1. All functions can be inlined after this pass 2. nv40 and other pre-DX10 chips without "continue" can be supported 3. nv30 and other pre-DX10 chips with no control flow at all are better supported Note that for full effect we should also teach the unroller to unroll loops with a fixed maximum number of iterations but with the canonical conditional "break" that this pass will insert if asked to. Continues are lowered by adding a per-loop "execute flag", initialized to TRUE, that when cleared inhibits all execution until the end of the loop. Breaks are lowered to continues, plus setting a "break flag" that is checked at the end of the loop, and trigger the unique "break". Returns are lowered to breaks/continues, plus adding a "return flag" that causes loops to break again out of their enclosing loops until all the loops are exited: then the "execute flag" logic will ignore everything until the end of the function. Note that "continue" and "return" can also be implemented by adding a dummy loop and using break. However, this is bad for hardware with limited nesting depth, and prevents further optimization, and thus is not currently performed.
2010-09-13glsl: add ir_control_flow_visitorLuca Barbieri
This is just a subclass of ir_visitor with empty implementations of all the visit methods for non-control flow nodes. Used to avoid duplicating that in ir_visitor subclasses. ir_hierarchical_visitor is another way to solve this, but is less natural for some applications.
2010-09-10glsl2: Fix scons build for all platformsJakob Bornecrantz
2010-09-09glsl2: Implement noise[1234] built-in functions using ir_unop_noiseIan Romanick
2010-09-09glsl2: Add lowering pass to remove noise opcodesIan Romanick
2010-09-09glsl2: Add ir_unop_noiseIan Romanick
2010-09-09glsl/builtins: normalize of a negative scalar should be -1.0.Kenneth Graunke
2010-09-08glsl: add several EmitNo* options, and MaxUnrollIterationsLuca Barbieri
This increases the chance that GLSL programs will actually work. Note that continues and returns are not yet lowered, so linking will just fail if not supported. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-09-08glsl: Add info about talloc and optimization passes to the README.Eric Anholt
2010-09-08glsl: Update README talking about multi-instruction operations.Eric Anholt
The previous thing taking multiple instructions ended up being handled at the IR level, as we suggested would be the common result. Pick a new one.
2010-09-08glsl/builtins: Set the API in the fake context.Kenneth Graunke
Otherwise it gets used uninitialized.
2010-09-08glsl2: Clear out profile pointers in _mesa_glsl_release_functionsIan Romanick
Otherwise builtin_profiles contains dangling pointers the next time _mesa_read_profile is called. I suspect this may fix bugzilla #29847, but I was never able to reproduce it.
2010-09-08glsl: Fix for scalar float built-in definitions.Kenneth Graunke
These need abs, and we need more tests.
2010-09-08glsl: regenerate builtinsEric Anholt
2010-09-08glsl: Fix typo in builtin step() using a wrong channel.Eric Anholt
2010-09-08ir_validate: Ensure ir_binop_dot is only used on vector types.Kenneth Graunke
2010-09-08glsl: Refresh automatically generated file builtin_function.cpp.Kenneth Graunke
2010-09-08glsl/builtins: Don't use ir_binop_dot on floating point values.Kenneth Graunke
ir_binop_dot is only defined for vector types. Use ir_binop_mul.
2010-09-08glsl/builtins: Simplify degenerate scalar float cases.Kenneth Graunke
The code being generated was just stupid, considering that: - normalize(x) = 1.0 - length(x) = x - distance(x, y) = x - y
2010-09-08glsl2: Make sure _mesa_glsl_parse_state constructor gets a contextIan Romanick
Fix an major regression in dc754586. Too bad that change was obviously never tested.
2010-09-08glsl: Support GLSL ES in the standalone compile.Chia-I Wu
GLSL ES mode is enabled when --glsl-es is passed to glsl_compiler.
2010-09-08glsl: Require a context in _mesa_glsl_parse_state.Chia-I Wu
Create a dummy context in the standalone compiler and pass it to _mesa_glsl_parse_state.