summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-22glsl2: Add the API defines to the glsl2 build so we get the right GLcontextEric Anholt
Fixes: draw_buffers-08.frag draw_buffers-09.frag glsl-vs-texturematrix-2
2010-07-22glsl2: Fix builtin prototypes defined in multiple glsl/builtins/* filesEric Anholt
If we put the protos in separate ir_functions, they wouldn't be found at lookup time for linking. Fixes: glsl-fs-texture2d-bias glsl-fs-texture2dproj-bias glsl-fs-texture2dproj-bias-2 glsl-lod-bias glsl1-texture2D(), computed coordinate
2010-07-22glsl2: Fix expected type for multiplying vector with non-square matrix.Carl Worth
Previously, the compiler expected the result of the multiplication to be of the same type as the vector. This is correct for square matrices, but wrong for all others. We fix this by instead expecting a vector with the same number of rows as the matrix (for the case of M*v with a column vector) or the same number of columns as the matrix (for v*M with a row vector). This fix causes the following four glean tests to now pass: glsl1-mat4x2 * vec4 glsl1-vec2 * mat4x2 multiply glsl1-vec3 * mat4x3 multiply glsl1-vec4 * mat3x4 multiply
2010-07-22glsl2: Fix the type of (1.0 - arg2) for mix(gen, gen, float).Eric Anholt
Previously, we'd constant-fold up a value of vec4(1.0 - arg2, 0, 0, 0). Fixes: glsl1-mix(vec4) function
2010-07-22glsl2: When inlining, don't clone and assign sampler arguments.Eric Anholt
Instead, just use the incoming sampler param. Fixes many texture-using piglit tests since the linker rework.
2010-07-22glsl2: When a "continue" happens in a "for" loop, run the loop expression.Eric Anholt
Fixes: glsl1-for-loop with continue Bug #29097
2010-07-22ir_to_mesa: Pretty up the printing of MESA_GLSL=dumpEric Anholt
2010-07-22mesa: Only complain about an infinite loop in a swrast program once.Eric Anholt
Chances are, if one fragment looped badly, others will too, and debugging output gets overwhelmed by the looping complaints.
2010-07-22ir_to_mesa: Add support for MESA_GLSL=dump environment var.Eric Anholt
2010-07-21glsl2: Use talloc on InfoLog handling in ValidateProgramEric Anholt
Fixes a segfault in Regnum Online.
2010-07-21glsl2: Update TODO.Kenneth Graunke
2010-07-21ir_constant_expression: Add support for array == and !=.Kenneth Graunke
Piglit parser tests const-array-03.frag and const-array-04.frag now generate the correct code.
2010-07-21ir_constant_expression: Add support for constant arrays.Kenneth Graunke
Fixes piglit test const-array-02.frag.
2010-07-21ir_reader: Add support for reading constant arrays.Kenneth Graunke
2010-07-21ir_print_visitor: Print out constant arrays.Kenneth Graunke
2010-07-21ir_print_visitor: Remove commas between ir_constant's components.Kenneth Graunke
The IR reader does not expect commas.
2010-07-21glsl2: Extend ir_constant to store constant arrays, and generate them.Kenneth Graunke
Since GLSL permits arrays of structures, we need to store each element as an ir_constant*, not just ir_constant_data. Fixes parser tests const-array-01.frag, const-array-03.frag, const-array-04.frag, const-array-05.frag, though 03 and 04 generate the wrong code.
2010-07-21glsl2: Emit array constructors inline.Kenneth Graunke
2010-07-21ast_to_hir: Fix bug in constant initializers.Kenneth Graunke
Implicit conversions were not being performed, nor was there any type checking - it was possible to have, say, var->type == float and var->constant_value->type == int. Later use of the constant expression would trigger an assertion. Fixes piglit test const-implicit-conversion.frag.
2010-07-21ir_constant_expression: Add support for ir_unop_u2f.Kenneth Graunke
Also make ir_unop_i2f only operate on signed integers.
2010-07-21ir_constant_expression: Remove open coded equality comparisons.Kenneth Graunke
The ir_constant::has_value method already does this.
2010-07-21glsl2: Add some comments.Kenneth Graunke
2010-07-21glsl2: Replace insert_before/remove pairs with exec_node::replace_with.Kenneth Graunke
2010-07-21linker: Link built-in functions instead of including them in every shaderIan Romanick
This is an invasive set of changes. Each user shader tracks a set of other shaders that contain built-in functions. During compilation, function prototypes are imported from these shaders. During linking, the shaders are linked with these built-in-function shaders just like with any other shader.
2010-07-21glsl2: Add function to import function prototypes from one IR tree to anotherIan Romanick
2010-07-21ir_to_mesa: Add missing initializion of lod_info variable.Carl Worth
To quiet a compiler warning.
2010-07-21glsl: Fix missing initialization of yylloc.sourceCarl Worth
In both the preprocessor and in the compiler proper, we use a custom yyltype struct to allow tracking the source-string number in addition to line and column. However, we were previously relying on bison's default initialization of the yyltype struct which of course is not aware of the source field and leaves it uninitialized. We fix this by defining our own YYLLOC_DEFAULT macro expanding on the default version (as appears in the bison manual) and adding initialization of yylloc.source.
2010-07-21glsl: Correctly handle unary plus operator.Carl Worth
Previously, any occurence of the unary plus operator would trigger a bogus type mismatch error. Fix this by making the ast_plus case look more like the ast_neg case as far as type-checking is concerned. With this change the shaders/CorrectPreprocess8.frag test in piglit now passes.
2010-07-20glsl2: glsl_type has its own talloc context, don't pass one inIan Romanick
2010-07-20linker: Do post-link lowering and optimizationIan Romanick
The lowering code should probably be moved elsewhere.
2010-07-20glsl2: Implement utility routine to talloc reparent an IR treeIan Romanick
2010-07-20glsl2: Add a constructor for _mesa_glsl_parse_stateIan Romanick
Coming changes to the handling of built-in functions necessitate this.
2010-07-20glsl2: Add and use new variable mode ir_var_temporaryIan Romanick
This is quite a large patch because breaking it into smaller pieces would result in the tree being intermitently broken. The big changes are: * Add the ir_var_temporary variable mode * Change the ir_variable constructor to take the mode as a parameter and correctly specify the mode for all ir_varables. * Change the linker to not cross validate ir_var_temporary variables. * Change the linker to pull all ir_var_temporary variables from global scope into 'main'.
2010-07-20ir_to_mesa: Validate the linked shaders as well.Eric Anholt
This caught the failure in cloning of ir_dereference_record.
2010-07-20glsl2: Check that nodes in a valid tree aren't error-type.Eric Anholt
We're good at propagating error types around, but finding when the first one was triggered can be painful if we aren't paying attention.
2010-07-20glsl2: strdup the field names used in dereference_record.Eric Anholt
Otherwise, after linking and freeing the old data, the pointer would dangle. Partial fix for glsl1-struct*.
2010-07-20glsl2: talloc the glsl_struct_field[] we use to look up structure types.Eric Anholt
Since the types are singletons across the lifetime of the compiler, repeatedly compiling a program with the same structure type defined would drop a copy of the array on the floor per compile. This is a bit tricky because the static GLSL types are not called with the talloc-based new, so we have to use the global type context, which may not be initialized yet.
2010-07-20glsl2: Don't claim a match on structure types with different field names.Eric Anholt
We regularly do lookups on the field names of the structure to find the types within the struct, so returning a structure type with bad names will lead to lots of error types being found.
2010-07-20glsl2: Add support for the .length() method on arrays.Kenneth Graunke
Fixes piglit test glsl-array-length, and provides proper error messages for negative piglit tests array-length-110.frag, array-length-unsized.frag, and array-length-args.frag.
2010-07-20glsl2: Remove incorrect assertion in the parser.Kenneth Graunke
This assertion is triggered by method calls (i.e. array.length()), where subexpressions[1] is an ast_function_call expression. Since the assertion itself had a comment saying it could be removed eventually, simply do so. Causes negative glslparser tests array-length-110.frag, array-length-args.frag, and array-length-unsized.frag to pass, but only because the length() method is not supported yet.
2010-07-20glsl2: Disallow non-constant array indexing for unsized arrays.Kenneth Graunke
Fixes piglit test unsized-array-non-const-index.vert.
2010-07-20ir_constant_expression: Remove pointless use of variable_referenced.Kenneth Graunke
ir_dereference_variable always references an ir_variable, so there's no point in calling a function and NULL-checking the result.
2010-07-20ir_constant_expression: Use "this" pointer directly.Kenneth Graunke
In ir_expression's signature, I replaced ir->operands[i] with op[i] as it is more concise; an assertion already ensures these are equal.
2010-07-20ir_constant_expression: Convert from a visitor to a virtual function.Kenneth Graunke
The constant_expression_wrapper was already the only external API, and much of the internal code used it anyway. Also, it wouldn't ever visit non-rvalue ir_instructions, so using a visitor seemed a bit unnecessary. This uses "ir_foo *ir = this;" lines to avoid code churn. These should be removed.
2010-07-20glsl2: Move constant_expression_value method to ir_rvalue.Kenneth Graunke
This prevents top-level callers from asking for the value of something that is guaranteed not to have one.
2010-07-20glcpp: Avoid accidental token pasting in preprocessed result.Carl Worth
Consider this test case: #define EMPTY int foo = 1+EMPTY+4; The expression should compile as the sequence of tokens 1, PLUS, UNARY_POSITIVE, 4. But glcpp has been failing for this case since it results in the string "1++4" which a compiler correctly sees as a syntax error, (1, POST_INCREMENT, 4). We fix this by changing any macro with an empty definition to result in a single SPACE token rather than nothing. This then gives "1+ +4" which compiles correctly. This commit does touch up the two existing test cases which already have empty macros, (to add the space to the expected result). It also adds a new test case to exercise the above scenario.
2010-07-20glcpp: Add missing include in xtalloc.cCarl Worth
Without this, the compiler was legitimately complaining about missing declarations for all of the functions being defined here.
2010-07-20glcpp: Add static keyword to several functions in the parser.Carl Worth
This quiets warnings about missing declarations otherwise.
2010-07-20glcpp: Avoid warnings in generated flex code.Carl Worth
We define the YY_NO_INPUT macro to avoid one needless function being generated. for the other needless functions, (yyunput and yy_top_state), we add a new UNREACHABLE start condition and call these functions from an action there. This doesn't change functionality at all, (since we never enter the UNREACHABLE start condition), but makes the compiler stop complaining about these two functions being defined but not used.
2010-07-20glcpp-lex: Declare some generated functions to eliminate compiler warnings.Carl Worth
It's really a bug in flex that these functions are generated with neither a declaration nor the 'static' keyword, but we can at least avoid the warnings this way.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-13 05:10:21 +0000