Ian Romanick [Mon, 29 Mar 2010 00:03:16 +0000 (17:03 -0700)]
Generate more correctly diagnostics from some invalid initializers
Ian Romanick [Sun, 28 Mar 2010 01:56:53 +0000 (18:56 -0700)]
Initial bits to process initializers in variable declarations
As a result, the following tests pass:
glslparsertest/array3.frag
glslparsertest/CGStandardLibrary.frag
glslparsertest/ConstantConversions.frag
glslparsertest/constructor1.frag
glslparsertest/constructor2.frag
glslparsertest/constructor3.V110.frag
glslparsertest/dataType4.frag
glslparsertest/dataType5.frag
glslparsertest/dataType13.frag
glslparsertest/dataType19.frag
glslparsertest/matrix.V110.frag
glslparsertest/parser7.frag
glslparsertest/swizzle3.frag
The following tests also pass, but it is just by dumb luck. In these
cases the shader fails to compile, but it fails for the wrong reason:
glslparsertest/array6.frag
glslparsertest/comma2.frag
glslparsertest/conditional1.frag
glslparsertest/conditional2.frag
glslparsertest/conditional3.frag
glslparsertest/constFunc.frag
glslparsertest/ParseTest3.frag
glslparsertest/ParseTest4.frag
glslparsertest/varying3.frag
glslparsertest/parser8.frag (also segfaults)
glslparsertest/parser9.frag (also segfaults)
The following tests now fail. As far as I can tell, these are all
cases where the shader was failing to compile, but it was failing for
the wrong reason.
glslparsertest/CorrectMatComma.frag
glslparsertest/CorrectModule.frag
glslparsertest/CorrectSwizzle2.vert
glslparsertest/shaders/glsl-fs-bug25902.frag
Ian Romanick [Sat, 27 Mar 2010 01:05:27 +0000 (18:05 -0700)]
Reject uniform initializers in GLSL 1.10 mode
Now both glslparsertest/dataType3.frag and glslparsertest/dataType2.frag pass.
Eric Anholt [Fri, 26 Mar 2010 23:37:53 +0000 (16:37 -0700)]
Set variables with the sampler base type to read only.
Fixes increment3.frag.
Eric Anholt [Fri, 26 Mar 2010 23:37:22 +0000 (16:37 -0700)]
Set the var_type for arrays to error_type until it's implemented.
"Fixes" segfaults in array tests.
Eric Anholt [Fri, 26 Mar 2010 19:16:54 +0000 (12:16 -0700)]
Add support for ast_to_hir of pre inc/dec.
Eric Anholt [Fri, 26 Mar 2010 19:14:54 +0000 (12:14 -0700)]
Add support for ast_to_hir of post inc/dec.
Eric Anholt [Fri, 26 Mar 2010 22:51:45 +0000 (15:51 -0700)]
Make read-only variables not be considered lvalues.
This should fix tests trying to assign to builtin "in" variables, and
will also be relied on for post_inc/dec handling.
Eric Anholt [Fri, 26 Mar 2010 19:07:44 +0000 (12:07 -0700)]
Add constructors for immediate hir constants.
This will make ast_to_hir for inc/dec easier.
Eric Anholt [Fri, 26 Mar 2010 18:57:46 +0000 (11:57 -0700)]
Add support for %= in ast_to_hir.
Eric Anholt [Fri, 26 Mar 2010 18:53:37 +0000 (11:53 -0700)]
Factor out assignment setup in ast_to_hir.
Eric Anholt [Fri, 26 Mar 2010 18:00:07 +0000 (11:00 -0700)]
IR print visitor: Print out something for the operator.
Ian Romanick [Sat, 27 Mar 2010 00:42:10 +0000 (17:42 -0700)]
IR print visitor: Print expressions a little better
Ian Romanick [Sat, 27 Mar 2010 00:38:58 +0000 (17:38 -0700)]
Initial implementation of constructor handling code
All of the scalar, vector, and matrix constructors *except* "from
bool" constructors should be handled. Array and structure
constructors are also not yet handled.
Ian Romanick [Sat, 27 Mar 2010 00:30:30 +0000 (17:30 -0700)]
IR print visitor: print function calls
Ian Romanick [Sat, 27 Mar 2010 00:29:29 +0000 (17:29 -0700)]
Add hack ir_call::callee_name to get the name of the called function
Ian Romanick [Sat, 27 Mar 2010 00:28:52 +0000 (17:28 -0700)]
Be sure to set ir_function_signature::definition for constructors
Ian Romanick [Sat, 27 Mar 2010 00:19:47 +0000 (17:19 -0700)]
Add ir_call::iterator to iterate over actual parameters
Ian Romanick [Sat, 27 Mar 2010 00:17:41 +0000 (17:17 -0700)]
Add missing parenthesis in foreach_iter
This allows uses like 'foreach_iter(exec_list_iterator, iter, *list_ptr)'.
Ian Romanick [Fri, 26 Mar 2010 23:41:43 +0000 (16:41 -0700)]
Add some simple constructor tests
Ian Romanick [Fri, 26 Mar 2010 23:11:48 +0000 (16:11 -0700)]
Add unary operator to convert unsigned integer to float
Ian Romanick [Fri, 26 Mar 2010 18:43:36 +0000 (11:43 -0700)]
Slightly change the representation of numeric types
For numeric types, vector_elements and matrix_columns must be at least
1. Previously matrix_columns was 0 for vectors, and both were 0 for
scalars. This change simplifies things in some places.
Ian Romanick [Fri, 26 Mar 2010 18:13:43 +0000 (11:13 -0700)]
Add glsl_type::components to query total number of components in a type
Ian Romanick [Fri, 26 Mar 2010 21:41:32 +0000 (14:41 -0700)]
Replace remaining use of is_error_type with glsl_type::is_error
Ian Romanick [Fri, 26 Mar 2010 21:40:37 +0000 (14:40 -0700)]
Replace remaining uses of is_numeric_base_type with glsl_type::is_numeric
Ian Romanick [Fri, 26 Mar 2010 21:38:37 +0000 (14:38 -0700)]
Replace is_integer_base_type macro with glsl_type::is_integer method
Ian Romanick [Fri, 26 Mar 2010 21:33:41 +0000 (14:33 -0700)]
Make glsl_*_type glsl_type class static data
Ian Romanick [Fri, 26 Mar 2010 21:27:23 +0000 (14:27 -0700)]
Use glsl_type::is_error instead of comparison with glsl_error_type pointer
Kenneth Graunke [Fri, 26 Mar 2010 08:20:08 +0000 (01:20 -0700)]
Move swizzles out of ir_dereference and into their own class.
Also turn generate_swizzle into a static "create" method of the new
class; we'll want to use it for the IR reader as well.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Kenneth Graunke [Fri, 26 Mar 2010 07:25:36 +0000 (00:25 -0700)]
Add new abstract ir_rvalue class; rework accordingly.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Kenneth Graunke [Fri, 26 Mar 2010 06:30:28 +0000 (23:30 -0700)]
Replace "mode" type tag with virtual as_foo() downcasting functions.
These should work well even in a non-flat IR hierarchy.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Ian Romanick [Fri, 26 Mar 2010 01:41:41 +0000 (18:41 -0700)]
Merge branch 'anholt'
Ian Romanick [Fri, 26 Mar 2010 01:38:28 +0000 (18:38 -0700)]
IR print visitor: Finish printing constants
Ian Romanick [Fri, 26 Mar 2010 01:29:25 +0000 (18:29 -0700)]
IR print visitor: Remove most of the newlines from the printed output
This makes it a lot easier to read... if you have a really wide display.
Ian Romanick [Fri, 26 Mar 2010 01:25:37 +0000 (18:25 -0700)]
IR print visitor: print expressions
Not quite complete. The operator is not yet printed.
Ian Romanick [Fri, 26 Mar 2010 00:38:13 +0000 (17:38 -0700)]
IR print visitor: print ir_dereference instructions
Also make a slight change to ir_variable. The ir_dereference tracks
the number of nested dereferences. If an ir_variable is visited and
the count is non-zero, just print the name of the variable.
Ian Romanick [Fri, 26 Mar 2010 00:04:26 +0000 (17:04 -0700)]
IR print visitor: Less newlines when printing ir_variables
Eric Anholt [Fri, 26 Mar 2010 00:02:15 +0000 (17:02 -0700)]
Fix assignment operators: *=, /=, +=, -=.
Basically, replace everything different from operator_assign other
than the creation of the rhs value from the lvalue and rvalue with the
contents of operator_assign. Fixes a segfault in
CorrectSwizzle1.frag, and fixes parser10.frag.
Ian Romanick [Fri, 26 Mar 2010 00:02:22 +0000 (17:02 -0700)]
Before generating HIR for user code, generate constructors for built-in types
Ian Romanick [Fri, 26 Mar 2010 00:01:15 +0000 (17:01 -0700)]
Add dereference constructor for array element dereferences
This should have gone in before the previous commit.
Ian Romanick [Thu, 25 Mar 2010 23:58:45 +0000 (16:58 -0700)]
Add functions to generate constructors for built-in types.
Currently only vector and matrix types are supported. Structure types will be
added later.
Eric Anholt [Thu, 25 Mar 2010 23:47:49 +0000 (16:47 -0700)]
Fix up the operator printing for the logic or and beyond, check array bounds.
Ian Romanick [Thu, 25 Mar 2010 23:02:41 +0000 (16:02 -0700)]
Merge branch 'anholt'
Eric Anholt [Thu, 25 Mar 2010 21:48:25 +0000 (14:48 -0700)]
Set up fragment shader builtin variables.
Eric Anholt [Thu, 25 Mar 2010 21:37:25 +0000 (14:37 -0700)]
Make the standalone parser return an exit code so we can automate testing.
Ian Romanick [Thu, 25 Mar 2010 20:41:32 +0000 (13:41 -0700)]
More matrix compilation tests
Ian Romanick [Thu, 25 Mar 2010 20:22:19 +0000 (13:22 -0700)]
Merge branch 'kwg'
Ian Romanick [Thu, 25 Mar 2010 20:19:13 +0000 (13:19 -0700)]
Fix matrix dimensioning
Newb GL mistake: matrices in GL are column-major. This means that
vector_elements is the number of rows. Making these changes causes
matrix-08.glsl to pass.
Ian Romanick [Thu, 25 Mar 2010 20:06:58 +0000 (13:06 -0700)]
Use glsl_type::row_type and glsl_type::column type in arithmetic_result_type
This substantially clarifies the code for matching matrix types. It
also eliminates some uses of glsl_type member data.
Ian Romanick [Thu, 25 Mar 2010 20:05:43 +0000 (13:05 -0700)]
Replace several glsl_type field comparisons with a single pointer comparison
This simplifies the process of matching function parameter types.
More simplifications are probably possible here, but arrays and
structures need to be implemented first.
Ian Romanick [Thu, 25 Mar 2010 18:42:45 +0000 (11:42 -0700)]
Add queries to get the glsl_type of a row or column of a matrix
Kenneth Graunke [Thu, 25 Mar 2010 18:22:42 +0000 (11:22 -0700)]
Widen num_components to handle vec4 correctly.
Kenneth Graunke [Tue, 23 Mar 2010 22:17:49 +0000 (15:17 -0700)]
Typo fixes: de/re/ference.
Ian Romanick [Thu, 25 Mar 2010 00:53:53 +0000 (17:53 -0700)]
Replace several field comparisons with a single pointer comparison
The only way the specified type fields can match is if the types are the
same. Previous tests (and assertions) have filtered away all other possible
cases.
Ian Romanick [Thu, 25 Mar 2010 00:47:20 +0000 (17:47 -0700)]
Remove unused _mesa_glsl_get_vector_type
This function has been completely replaced by glsl_type::get_instance.
Ian Romanick [Thu, 25 Mar 2010 00:46:39 +0000 (17:46 -0700)]
Use glsl_type::get_instance instead of _mesa_glsl_get_vector_type
Ian Romanick [Thu, 25 Mar 2010 00:45:14 +0000 (17:45 -0700)]
Use glsl_type::get_instance instead of symbol table look-up
Ian Romanick [Thu, 25 Mar 2010 00:42:59 +0000 (17:42 -0700)]
Add some matrix math tests
Ian Romanick [Thu, 25 Mar 2010 00:11:30 +0000 (17:11 -0700)]
Add glsl_type::get_instance method
Gets the singleton corresponding to a particular scalar, vector, or
matrix type.
Ian Romanick [Thu, 25 Mar 2010 00:08:13 +0000 (17:08 -0700)]
Replace accesses to glsl_type data with query functions
In these particular cases, using the query functions makes it more obvious
what is happening.
Ian Romanick [Thu, 25 Mar 2010 00:05:09 +0000 (17:05 -0700)]
Add class-private handles to matrix types in glsl_type
Ian Romanick [Wed, 24 Mar 2010 22:27:50 +0000 (15:27 -0700)]
Fix typo in swizzle processing loop
One of the accesses to str in the loop used str[0] instead of str[i].
Reported-by: Kenneth Graunke
Ian Romanick [Wed, 24 Mar 2010 22:27:04 +0000 (15:27 -0700)]
Trivial cleanups in generate_swizzle
Add 'const' and 'static const' in a couple of places.
Ian Romanick [Wed, 24 Mar 2010 22:25:23 +0000 (15:25 -0700)]
Use ir_dereference::set_swizzle
Ian Romanick [Wed, 24 Mar 2010 22:12:21 +0000 (15:12 -0700)]
Add method to set the swizzle of an ir_dereference
Ian Romanick [Wed, 24 Mar 2010 21:56:36 +0000 (14:56 -0700)]
Allow duplicate symbols at the same scope that are in different name spaces
Ian Romanick [Wed, 24 Mar 2010 19:10:39 +0000 (12:10 -0700)]
Merge branch 'anholt'
Ian Romanick [Wed, 24 Mar 2010 19:08:46 +0000 (12:08 -0700)]
Add (negative) test for constructing samplers
Ian Romanick [Wed, 24 Mar 2010 00:42:04 +0000 (17:42 -0700)]
ir_function constructor now takes the function name as a parameter
Ian Romanick [Wed, 24 Mar 2010 00:31:39 +0000 (17:31 -0700)]
Add glsl_type::get_base_type query
Retreives the glsl_type that corresponds to the base type of a numeric scalar /
vector / matrix type. So vec4 returns float, etc.
Ian Romanick [Wed, 24 Mar 2010 00:31:03 +0000 (17:31 -0700)]
Add glsl_type::is_numeric and glsl_type::is_boolean queries
Ian Romanick [Tue, 23 Mar 2010 22:08:30 +0000 (15:08 -0700)]
Begin processing constructors
Right now, reject constructors for samplers because the are illegal.
Ian Romanick [Tue, 23 Mar 2010 22:03:46 +0000 (15:03 -0700)]
Add query to determine whether a type is a sampler
Ian Romanick [Tue, 23 Mar 2010 20:23:53 +0000 (13:23 -0700)]
Add test for invalid assignment of function return value
Ian Romanick [Tue, 23 Mar 2010 20:23:31 +0000 (13:23 -0700)]
Add *some* type checking for assignments
Ian Romanick [Tue, 23 Mar 2010 20:21:19 +0000 (13:21 -0700)]
Disallow passing NULL for state to _mesa_glsl_error
The two places that were still passing NULL had a state pointer to
pass. Not passing it in these places prevented termination of
compilation of erroneous programs.
Ian Romanick [Tue, 23 Mar 2010 20:04:19 +0000 (13:04 -0700)]
Fix typographical errors of "FINISHME"
Eric Anholt [Wed, 24 Mar 2010 03:43:10 +0000 (20:43 -0700)]
Include other generated sources in BUILT_SOURCES.
Otherwise, having cleaned glsl_parser.h, we'd never regenerate it because
glsl_parser.cpp was already right where it needed to be.
Eric Anholt [Wed, 24 Mar 2010 03:24:33 +0000 (20:24 -0700)]
Use bash for the built file generation since builtin_types.sh requires it.
Eric Anholt [Wed, 24 Mar 2010 03:24:11 +0000 (20:24 -0700)]
Clean the built sources with make clean.
Ian Romanick [Tue, 23 Mar 2010 19:28:44 +0000 (12:28 -0700)]
Generate an error for variables declared with type void
Ian Romanick [Tue, 23 Mar 2010 19:28:28 +0000 (12:28 -0700)]
Add is_error and is_void type queries
Ian Romanick [Tue, 23 Mar 2010 19:21:18 +0000 (12:21 -0700)]
Set the type of a function call to be the return type of the callee
Ian Romanick [Tue, 23 Mar 2010 19:19:13 +0000 (12:19 -0700)]
Set, and require, a return type for function signatures
Ian Romanick [Tue, 23 Mar 2010 19:11:50 +0000 (12:11 -0700)]
Add `void' type to table of available types
This will make void-01.glsl test fail, so I may regret this later.
However, this will make supporting functions that return void or
functions that have a void parameter list easier to handle.
Ian Romanick [Tue, 23 Mar 2010 18:57:24 +0000 (11:57 -0700)]
Rename test GLSL sources from .txt to .glsl
Ian Romanick [Tue, 23 Mar 2010 18:54:03 +0000 (11:54 -0700)]
Add test for declaring variables of type void.
Ian Romanick [Sat, 20 Mar 2010 00:08:05 +0000 (17:08 -0700)]
Track the function that is currently being defined
Later this will allow type checking for return statements.
Ian Romanick [Fri, 19 Mar 2010 23:45:19 +0000 (16:45 -0700)]
Initial bits for converting AST return nodes to IR return instructions
Ian Romanick [Fri, 19 Mar 2010 23:44:52 +0000 (16:44 -0700)]
Implement IR return instructions
Ian Romanick [Fri, 19 Mar 2010 22:38:52 +0000 (15:38 -0700)]
Use glsl_symbol_table::name_declared_this_scope
Prevent most illegal name reuse.
Ian Romanick [Fri, 19 Mar 2010 22:37:01 +0000 (15:37 -0700)]
Add query to determine whether a name was declared at this scope
This will be used to prevent a variable and a function with the same
name from being declared. As a side effect, the calls to
add_{type,name,function} should never fail.
Ian Romanick [Fri, 19 Mar 2010 22:34:13 +0000 (15:34 -0700)]
Use separate namespaces for types, variables, and functions
This will allow types and their constructors to be easily stored in
the same symbol table. This does add a potential problem that a
shader could declare a variable and a function with the same name.
This appears to be forbidden by the GLSL spec.
Ian Romanick [Fri, 19 Mar 2010 22:32:57 +0000 (15:32 -0700)]
Add function to determine the scope where a variable is declared
Ian Romanick [Fri, 19 Mar 2010 18:57:24 +0000 (11:57 -0700)]
Use glsl_symbol_table instead of using _mesa_symbol_table directly
Ian Romanick [Fri, 19 Mar 2010 18:42:45 +0000 (11:42 -0700)]
Add a GLSL-specific facade to _mesa_symbol_table
This adds some type saftey and will enable elimination of a bunch of
type casts and other ugly crap in the code.
Ian Romanick [Fri, 19 Mar 2010 18:12:33 +0000 (11:12 -0700)]
Don't track new type names during pass-1 parsing
This implementation was wrong anyway because it did not respect
scoping rules. This will need to be revisited soon. The most likely
result is that the grammar is going to need some significant re-work
to be able to use a IDENTIFIER in all the places where a TYPE_NAME is
currently used.
Ian Romanick [Mon, 15 Mar 2010 22:20:15 +0000 (15:20 -0700)]
Add multiple include protection to ir.h
Ian Romanick [Mon, 15 Mar 2010 21:31:48 +0000 (14:31 -0700)]
Trivial clean-ups to ast_type_specifier(int) constructor
Ian Romanick [Mon, 15 Mar 2010 21:28:17 +0000 (14:28 -0700)]
Add new constructors for ast_type_specifier
Add a constructor that uses an ast_struct_specifier and one that uses
a type name. This saves a (trivial) bit of code, but it also ensures
some of the class invariants (i.e., type_name != NULL) are met.