OSDN Git Service
Eric Anholt [Thu, 8 Apr 2010 22:10:37 +0000 (15:10 -0700)]
Add support for builtin gentype mix(gentype a, gentype b)
Fixes glsl-fs-mix.frag, glsl-fs-mix-constant.frag.
Eric Anholt [Thu, 8 Apr 2010 22:02:59 +0000 (15:02 -0700)]
Add buitlin functions for any(), all(), not().
Eric Anholt [Thu, 8 Apr 2010 21:34:38 +0000 (14:34 -0700)]
Add builtin normalize() functions.
Fixes CorrectSqizzle2.vert.
Eric Anholt [Thu, 8 Apr 2010 20:42:48 +0000 (13:42 -0700)]
Repeat the optimization passes until we stop making progress.
Eric Anholt [Thu, 8 Apr 2010 20:40:52 +0000 (13:40 -0700)]
Add inlining support for array dereferences.
Eric Anholt [Wed, 7 Apr 2010 18:46:26 +0000 (11:46 -0700)]
Inline functions consisting of a return of an expression.
Ian Romanick [Thu, 8 Apr 2010 01:03:50 +0000 (18:03 -0700)]
Remove extraneous base-class constructor calls
Eric Anholt [Wed, 7 Apr 2010 21:32:53 +0000 (14:32 -0700)]
Make function bodies rely on the parameter variable declarations.
Previously, generating inlined function bodies was going to be
difficult, as there was no mapping between the body's declaration of
variables where parameter values were supposed to live and the
parameter variables that a caller would use in paramater setup.
Presumably this also have been a problem for actual codegen.
Eric Anholt [Wed, 7 Apr 2010 22:18:37 +0000 (15:18 -0700)]
Make dot() take the right number of args.
Eric Anholt [Wed, 7 Apr 2010 20:34:15 +0000 (13:34 -0700)]
Fix the returns of builtin functions to actually return.
Eric Anholt [Wed, 7 Apr 2010 20:19:11 +0000 (13:19 -0700)]
Put function bodies under function signatures, instead of flat in the parent.
This will let us know the length of function bodies for the purpose of
inlining (among other uses).
Eric Anholt [Wed, 7 Apr 2010 19:35:34 +0000 (12:35 -0700)]
Clarify the types of various exec_list in ir.h
Ian Romanick [Thu, 8 Apr 2010 00:13:44 +0000 (17:13 -0700)]
Treat texture rectangles as an extension that is enabled be default
Ian Romanick [Wed, 7 Apr 2010 23:59:46 +0000 (16:59 -0700)]
Add support for GL_ARB_draw_buffers extension
Ian Romanick [Wed, 7 Apr 2010 23:57:56 +0000 (16:57 -0700)]
Clean up error reporting in _mesa_glsl_process_extension
Ian Romanick [Wed, 7 Apr 2010 23:53:54 +0000 (16:53 -0700)]
Add tracking for extension based warnings
Using '#extension foo: warn' instructs the compiler to generate a
warning when some feature of the extension 'foo' is used. This patch
adds some infrastructure needed to support that for variables.
Similar changes will be needed for types and built-in functions.
Ian Romanick [Wed, 7 Apr 2010 21:50:36 +0000 (14:50 -0700)]
Emit a warning when an unknown extension is used with #extension
Ian Romanick [Wed, 7 Apr 2010 21:47:46 +0000 (14:47 -0700)]
Add _mesa_glsl_warning to emit warnings to the shader log
Ian Romanick [Wed, 7 Apr 2010 23:46:25 +0000 (16:46 -0700)]
Begin processing #extension directive
Nowhere near complete. It just parses correctly at this point.
Ian Romanick [Wed, 7 Apr 2010 23:41:40 +0000 (16:41 -0700)]
Use _mesa_glsl_shader_target_name
Ian Romanick [Wed, 7 Apr 2010 23:44:30 +0000 (16:44 -0700)]
Add utility function to get the name of a shader target
Ian Romanick [Wed, 7 Apr 2010 23:09:47 +0000 (16:09 -0700)]
Call glsl_type::get_instance correctly: the number of rows must be at least 1
This causes the following tests to pass:
shaders/glsl-tex-mvp.vert
Ian Romanick [Wed, 7 Apr 2010 21:49:59 +0000 (14:49 -0700)]
Eat whitespace while in the PP state
Ian Romanick [Wed, 7 Apr 2010 20:43:52 +0000 (13:43 -0700)]
Partially fix comment handling in preprocessor directives.
Multi-line /* */ comments are still broken. I think this will wait to
be fixed until we have a real preprocessor.
Ian Romanick [Wed, 7 Apr 2010 23:48:42 +0000 (16:48 -0700)]
Add support for bool to ir_equal and ir_nequal constant handling
Ian Romanick [Wed, 7 Apr 2010 23:47:44 +0000 (16:47 -0700)]
Add gl_ClipDistance in fragment shader
Ian Romanick [Tue, 6 Apr 2010 01:07:27 +0000 (18:07 -0700)]
Generate correct IR for do-while loops
Previously the same code was generated for a while loop and a do-while
loop. This pulls the code that generates the conditional break into a
separate method. This method is called either at the beginning or the
end depending on the loop type.
Reported-by: Kenneth Graunke <kenneth@whitecape.org>
Ian Romanick [Tue, 6 Apr 2010 00:13:47 +0000 (17:13 -0700)]
Process ast_jump_statement into ir_loop_jump
Specifically, handle 'break' and 'continue' inside loops.
This causes the following tests to pass:
glslparsertest/shaders/break.frag
glslparsertest/shaders/continue.frag
Ian Romanick [Tue, 6 Apr 2010 00:13:14 +0000 (17:13 -0700)]
Add dynamic cast for ir_loop
Ian Romanick [Tue, 6 Apr 2010 00:01:53 +0000 (17:01 -0700)]
Begin tracking the nesting of loops and switch-statements
Ian Romanick [Mon, 5 Apr 2010 23:53:19 +0000 (16:53 -0700)]
Use switch based on mode in ast_jump_statement::hir
Ian Romanick [Mon, 5 Apr 2010 23:38:20 +0000 (16:38 -0700)]
Add some newlines when printing ir_loop instructions
Ian Romanick [Mon, 5 Apr 2010 23:37:49 +0000 (16:37 -0700)]
Process ast_iteration_statement into ir_loop
This causes the following tests to pass:
glslparsertest/shaders/dowhile.frag
glslparsertest/shaders/while.frag
glslparsertest/shaders/while1.frag
glslparsertest/shaders/while2.frag
Ian Romanick [Mon, 5 Apr 2010 23:28:15 +0000 (16:28 -0700)]
Add ir_loop_jump to represent 'break' and 'continue' in loops
Ian Romanick [Mon, 5 Apr 2010 23:16:07 +0000 (16:16 -0700)]
Add ir_loop to represent loops
This touches a lot of files because everything derived from ir_visitor
has to be updated. This is the primary disadvantage of the visitor pattern.
Eric Anholt [Tue, 6 Apr 2010 19:13:02 +0000 (12:13 -0700)]
Add some linebreaks in the ir_print_visitor of if statement bodies.
Eric Anholt [Tue, 6 Apr 2010 18:52:09 +0000 (11:52 -0700)]
Make constant folding descend into if statements.
Eric Anholt [Tue, 6 Apr 2010 18:42:01 +0000 (11:42 -0700)]
Descend down the tree in more locations in constant folding.
Eric Anholt [Tue, 6 Apr 2010 18:11:05 +0000 (11:11 -0700)]
Perform constant folding on array indices.
Replaces a constant var deref with a constant value in CorrectParse1.frag.
Eric Anholt [Tue, 6 Apr 2010 17:53:57 +0000 (10:53 -0700)]
Add float/int conversion to ir_constant_expression.cpp.
Gives CorrectParse2.frag one more constant folding.
Eric Anholt [Tue, 6 Apr 2010 17:30:54 +0000 (10:30 -0700)]
Handle constant expressions using derefs of const values.
Fixes CorrectParse1.frag and makes for a ton of folding in
CorrectParse2.frag.
Eric Anholt [Tue, 6 Apr 2010 17:07:20 +0000 (10:07 -0700)]
Fold constant expressions in if conditionals.
Fixes up 3 more expressions in CorrectParse2.frag.
Eric Anholt [Tue, 6 Apr 2010 17:02:27 +0000 (10:02 -0700)]
Add support for =, != to ir_constant_expresion.cpp
This results in constant folding of one more expression in CorrectParse2.frag.
Eric Anholt [Tue, 6 Apr 2010 16:55:45 +0000 (09:55 -0700)]
Add ir_constant_expression.cpp support for <, >, <=, >=.
This results in folding one more constant expression in CorrectParse2.frag.
Eric Anholt [Mon, 5 Apr 2010 22:24:28 +0000 (15:24 -0700)]
Add a constant folding optimization pass.
Eric Anholt [Sat, 3 Apr 2010 06:47:06 +0000 (23:47 -0700)]
Add definition of gl_ClipDistance[]
Ian Romanick [Mon, 5 Apr 2010 21:35:47 +0000 (14:35 -0700)]
Set lower bound on size implied by whole-array assignment
When an unsized array is accessed with a constant extension index this
sets a lower bound on the allowable sizes. When the unsized array
gets a size set due to a whole-array assignment, this size must be at
least as large as the implied lower bound.
This causes the following tests to pass:
glslparsertest/glsl2/array-16.vert
Ian Romanick [Mon, 5 Apr 2010 20:16:00 +0000 (13:16 -0700)]
Allow dereference of vectors and matrices with []
This causes the following tests to pass:
glslparsertest/glsl2/matrix-11.vert
glslparsertest/glsl2/matrix-12.vert
glslparsertest/shaders/CorrectParse2.vert
glslparsertest/shaders/CorrectSwizzle2.frag
Ian Romanick [Mon, 5 Apr 2010 17:30:15 +0000 (10:30 -0700)]
Set correct type for ir_dereference of a matrix or a vector
Ian Romanick [Sat, 3 Apr 2010 00:44:39 +0000 (17:44 -0700)]
Propagate sizes when assigning a whole array to an unsized array
Ian Romanick [Sat, 3 Apr 2010 00:17:47 +0000 (17:17 -0700)]
Track whether whole-arrays are assignable
In GLSL 1.10 this was not allowed, but in GLSL 1.20 and later it is.
This causes the following tests to pass:
glslparsertest/glsl2/array-09.vert
glslparsertest/glsl2/array-13.vert
Ian Romanick [Sat, 3 Apr 2010 00:05:59 +0000 (17:05 -0700)]
Whole structures are assignable
Whole arrays are assignable in GLSL 1.20 and later, but it's not clear
how to handle that within the IR because the IR is supposed to be
shading language version agnostic.
Ian Romanick [Fri, 2 Apr 2010 23:08:44 +0000 (16:08 -0700)]
Use glsl_type::element_type to get the type of array elements
Ian Romanick [Fri, 2 Apr 2010 22:51:02 +0000 (15:51 -0700)]
Ensure that 'in' and 'inout' formal parameters are valid lvalues
This causes the following tests to pass:
glslparsertest/shaders/function10.frag
Ian Romanick [Fri, 2 Apr 2010 22:30:45 +0000 (15:30 -0700)]
Additional void parameter checks
If there is a void parameter it must not have a name, and it must be
the only parameter.
Ian Romanick [Fri, 2 Apr 2010 22:09:33 +0000 (15:09 -0700)]
Require that function formal parameters have names
Ian Romanick [Fri, 2 Apr 2010 18:59:57 +0000 (11:59 -0700)]
Make built-in gl_TexCoord available in vertex and fragment shaders
Ian Romanick [Fri, 2 Apr 2010 18:45:06 +0000 (11:45 -0700)]
Fix matching of integer function parameters
This causes the following tests to pass:
glslparsertest/shaders/function10.frag
Eric Anholt [Fri, 2 Apr 2010 12:17:08 +0000 (02:17 -1000)]
Add bool/int conversion as IR operations.
Fixes constructor-09.glsl and CorrectParse2.frag.
Eric Anholt [Fri, 2 Apr 2010 12:13:43 +0000 (02:13 -1000)]
Add conversion of bool to float as an IR operation to match int to float.
Eric Anholt [Fri, 2 Apr 2010 11:59:50 +0000 (01:59 -1000)]
Add PASS / FAIL annotations to tests missing them.
This tricked my import of the tests into piglit.
Eric Anholt [Fri, 2 Apr 2010 11:53:57 +0000 (01:53 -1000)]
Test that invalid quailfiers aren't used on variables in GLSL 1.10.
Eric Anholt [Fri, 2 Apr 2010 06:27:35 +0000 (20:27 -1000)]
Allow array dereferences to be considered as lvalues.
Fixes glsl-vs-arrays.vert and glsl-vs-mov-after-deref.vert.
Regresses parser3.frag which was failing for the wrong reason.
Eric Anholt [Fri, 2 Apr 2010 05:00:29 +0000 (19:00 -1000)]
Test for the type being different in parameter_lists_match.
Fixes CorrectFuncOverload.frag.
Eric Anholt [Fri, 2 Apr 2010 04:35:42 +0000 (18:35 -1000)]
Add some more operations to ir_constant_expression.cpp.
Eric Anholt [Fri, 2 Apr 2010 04:25:11 +0000 (18:25 -1000)]
Make ir_constant_expression.cpp support multi-component types.
Eric Anholt [Fri, 2 Apr 2010 04:07:08 +0000 (18:07 -1000)]
Simplify ir_constant_expression.cpp by factoring operand computation out.
Eric Anholt [Thu, 1 Apr 2010 07:21:20 +0000 (21:21 -1000)]
Reject non-float varyings.
Fixes varying2.frag.
Eric Anholt [Thu, 1 Apr 2010 07:12:12 +0000 (21:12 -1000)]
Remove fake ir_binop_logic_not. I think you meant ir_unop_logic_not.
Eric Anholt [Thu, 1 Apr 2010 07:09:02 +0000 (21:09 -1000)]
Handle logic not in constant expression evaluation.
Eric Anholt [Thu, 1 Apr 2010 03:05:32 +0000 (17:05 -1000)]
Fix error handling of logic operators.
They were always throwing a type error because type wasn't being set.
Eric Anholt [Thu, 1 Apr 2010 02:53:47 +0000 (16:53 -1000)]
Emit errors for unfinished ast_to_hir expression operations.
Eric Anholt [Thu, 1 Apr 2010 02:50:55 +0000 (16:50 -1000)]
Fix ast_logic_not handling to be unary, not binary.
Eric Anholt [Thu, 1 Apr 2010 02:45:20 +0000 (16:45 -1000)]
Add errors for type results of other expressions.
Eric Anholt [Thu, 1 Apr 2010 02:38:11 +0000 (16:38 -1000)]
Emit errors from failure in arithmetic_result_type.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Thu, 1 Apr 2010 02:25:12 +0000 (16:25 -1000)]
Start trying to fill in a few bits of ir_constant_expression.cpp
This makes a little progress on CorrectParse2.frag.
Eric Anholt [Thu, 1 Apr 2010 01:53:26 +0000 (15:53 -1000)]
Compute the constant value of a constant initializer.
Fixes constFunc.frag.
Eric Anholt [Thu, 1 Apr 2010 01:44:38 +0000 (15:44 -1000)]
Allow initializers of constant values to succeed.
This regresses constFunc.frag, but that's just unexpectedly passing
because of the FINISHME just above.
Eric Anholt [Wed, 31 Mar 2010 19:56:36 +0000 (09:56 -1000)]
Don't create a parameter declaration for a (void) parameter.
Fixes segfaults in a shader consisting of just:
void main(void) { }
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Ian Romanick [Fri, 2 Apr 2010 18:03:47 +0000 (11:03 -0700)]
Remove ast_node::type
It isn't a type (is was enum specifying the kind of node), it was
unused, and it was easily confused with actual type fields. Kill with fire.
Ian Romanick [Fri, 2 Apr 2010 01:31:11 +0000 (18:31 -0700)]
Track max accessed array element, reject additional out-of-bounds accesses
For unsized arrays, we can't flag out-of-bounds accesses until the
array is redeclared with a size. Track the maximum accessed element
and generate an error if the declaration specifies a size that would
cause that access to be out-of-bounds.
This causes the following tests to pass:
glslparsertest/shaders/array10.frag
Ian Romanick [Fri, 2 Apr 2010 01:03:59 +0000 (18:03 -0700)]
Begin processing ast_array_index nodes
This causes the following tests to pass:
glslparsertest/shaders/parser3.frag
glslparsertest/shaders/varying3.frag (also generates spurious error)
Ian Romanick [Fri, 2 Apr 2010 01:02:48 +0000 (18:02 -0700)]
Fix type handling in ir_dereference array dereference constructor
Ian Romanick [Fri, 2 Apr 2010 00:25:11 +0000 (17:25 -0700)]
Allow unsized arrays to be redeclared with a size
Test glslparsertest/shaders/array11.frag now passes for the right reason.
Ian Romanick [Fri, 2 Apr 2010 00:17:34 +0000 (17:17 -0700)]
Add glsl_type::element_type and glsl_type::array_size queries
The former gets the type of elements in an array, and the later gets
the declared size, if any, of the array.
Kenneth Graunke [Thu, 1 Apr 2010 00:12:34 +0000 (17:12 -0700)]
Set source locations on AST nodes so error messages print locations.
I haven't verified that these are all correct, but it's still a lot
better than not having anything.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Ian Romanick [Thu, 1 Apr 2010 01:23:21 +0000 (18:23 -0700)]
Add ast_function::hir
ast_function::hir consists of bits pulled out of
ast_function_definition::hir. In fact, the later uses the former to
do a lot of its processing. Several class private data fields were
added to ast_function to facilitate communicate between the two.
This causes the following tests to pass:
glslparsertest/shaders/CorrectModule.frag
This causes the following tests to fail. These shaders were
previously failing to compile, but they were all failing for the wrong
reasons.
glslparsertest/shaders/function9.frag
glslparsertest/shaders/function10.frag
Ian Romanick [Thu, 1 Apr 2010 01:15:50 +0000 (18:15 -0700)]
Fix exec_list::move_nodes_to when the source list is empty
Ian Romanick [Thu, 1 Apr 2010 00:54:26 +0000 (17:54 -0700)]
Use ir_variable::clone to copy parameters to the function body
Several other code movements were also done. This partitions this
function into two halves. The first half processes the prototype
part, and the second have processes the actual function definition.
The coming patch series will parition ast_function_definition::hir
into (at least) two separate functions.
Ian Romanick [Thu, 1 Apr 2010 00:52:44 +0000 (17:52 -0700)]
Add ir_variable::clone
Ian Romanick [Thu, 1 Apr 2010 00:39:10 +0000 (17:39 -0700)]
Minor cleanups in ast_function_definition::hir
Ian Romanick [Wed, 31 Mar 2010 23:48:48 +0000 (16:48 -0700)]
Generate array constructor calls
Ian Romanick [Wed, 31 Mar 2010 23:44:12 +0000 (16:44 -0700)]
Add ir_function_signature::function_name
Ian Romanick [Wed, 31 Mar 2010 23:40:58 +0000 (16:40 -0700)]
Make ir_function::signatures private
Ian Romanick [Wed, 31 Mar 2010 23:40:26 +0000 (16:40 -0700)]
Add ir_function::iterator to iterate over function signatures
Ian Romanick [Wed, 31 Mar 2010 23:37:10 +0000 (16:37 -0700)]
Use ir_function::add_signature to create link between function and signature
ir_function_signature now has a pointer back to the ir_function that owns it.
Ian Romanick [Wed, 31 Mar 2010 23:30:56 +0000 (16:30 -0700)]
Add glsl_type::generate_constructor_prototype
Generates a symbol table entry and the IR approximation of a prototype for a
type's constructor. Currently only arrays are supported.
Ian Romanick [Wed, 31 Mar 2010 23:28:51 +0000 (16:28 -0700)]
Refactor parts of match_function_by_name into process_parameters and process_call
These will be used in the functions that implement calls to array constructors.
Ian Romanick [Wed, 31 Mar 2010 23:25:21 +0000 (16:25 -0700)]
Reject array constructor calls in GLSL 1.10
Ian Romanick [Wed, 31 Mar 2010 23:22:56 +0000 (16:22 -0700)]
Use ast_type_specifier::glsl_type to get the type of a constructor
This is the first baby step towards getting array constructors working.