Ian Romanick
03d3f3ab71
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.
2010-04-02 11:05:16 -07:00
Ian Romanick
b8a21cc6df
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
2010-04-01 18:35:08 -07:00
Ian Romanick
27e3cf8c0d
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)
2010-04-01 18:34:56 -07:00
Ian Romanick
63af4b0e99
Fix type handling in ir_dereference array dereference constructor
2010-04-01 18:02:48 -07:00
Ian Romanick
a4f308f066
Allow unsized arrays to be redeclared with a size
...
Test glslparsertest/shaders/array11.frag now passes for the right reason.
2010-04-01 17:25:11 -07:00
Ian Romanick
00e517616b
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.
2010-04-01 17:17:34 -07:00
Kenneth Graunke
ebfdef7a83
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>
2010-03-31 18:26:27 -07:00
Ian Romanick
92318a9479
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
2010-03-31 18:23:21 -07:00
Ian Romanick
acce380a3f
Fix exec_list::move_nodes_to when the source list is empty
2010-03-31 18:15:50 -07:00
Ian Romanick
e29a585989
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.
2010-03-31 17:54:26 -07:00
Ian Romanick
2d394d4877
Add ir_variable::clone
2010-03-31 17:52:44 -07:00
Ian Romanick
25711a85c2
Minor cleanups in ast_function_definition::hir
2010-03-31 17:43:33 -07:00
Ian Romanick
00aa173c9c
Generate array constructor calls
2010-03-31 16:48:48 -07:00
Ian Romanick
0f0ea58264
Add ir_function_signature::function_name
2010-03-31 16:44:12 -07:00
Ian Romanick
a4775823b0
Make ir_function::signatures private
2010-03-31 16:40:58 -07:00
Ian Romanick
95cd6cc195
Add ir_function::iterator to iterate over function signatures
2010-03-31 16:40:26 -07:00
Ian Romanick
6a15d5b514
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.
2010-03-31 16:37:10 -07:00
Ian Romanick
4ef183e51d
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.
2010-03-31 16:30:56 -07:00
Ian Romanick
68515ee6c2
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.
2010-03-31 16:28:51 -07:00
Ian Romanick
b6326abb85
Reject array constructor calls in GLSL 1.10
2010-03-31 16:25:21 -07:00
Ian Romanick
3e0ef5f81b
Use ast_type_specifier::glsl_type to get the type of a constructor
...
This is the first baby step towards getting array constructors working.
2010-03-31 16:22:56 -07:00
Ian Romanick
d612a127cc
Move type_specifier_to_glsl_type to ast_type_specifier::glsl_type
...
This make is easily accessible from other modules.
2010-03-31 16:22:06 -07:00
Ian Romanick
615adcda8a
More array declaration tests
2010-03-31 16:16:54 -07:00
Ian Romanick
299ed08a68
Fix big dumbness in glsl_type::get_array_instance
...
hash_table_insert needs to keep the key so that it compare keys on a
following hash_table_find call. Since key was allocated on the stack,
it disappeared out from under the hash table.
2010-03-31 16:13:38 -07:00
Ian Romanick
0bf3810165
glsl_type array constructor generate a real name for the type
2010-03-31 14:37:42 -07:00
Eric Anholt
0ed6125725
Test that const declarations include initializers.
...
Fixes dataType6.frag, and also array2.frag for an unexpected but valid
reason.
2010-03-31 13:17:23 -07:00
Ian Romanick
e0800062da
Reject declarations with 'in' or 'out' qualifiers
...
'in' and 'out' can only be used in function parameter lists or at
global scope (1.30 and later). This change enforces this.
2010-03-31 13:15:23 -07:00
Ian Romanick
a705d65ccd
Add 'in' to some parameters of the function
...
This goes along with the qualifier-?? tests.
2010-03-31 13:14:37 -07:00
Ian Romanick
d8a2133887
Add some variable declaration qualifier tests
2010-03-31 13:13:12 -07:00
Ian Romanick
d8065d86e8
Fix comment bug and printf bug in previous commit
2010-03-31 13:03:56 -07:00
Ian Romanick
b168e53452
Require that 'uniform' and 'varying' variables be declared at global scope
...
This causes the following tests to pass:
glslparsertest/shaders/uniform.frag
glslparsertest/shaders/varying.frag
2010-03-31 12:31:18 -07:00
Ian Romanick
e1c1a3f3bd
Slightly refector checks for declarations that must be at global scope
2010-03-31 12:26:03 -07:00
Eric Anholt
b82c0c31ae
Implement logical operators.
...
Fixes parser9.frag.
2010-03-31 09:17:39 -10:00
Eric Anholt
b97ee2e260
Test that variable names don't use the reserved gl_ prefix.
...
Fixes identifier2.frag.
2010-03-31 09:17:35 -10:00
Eric Anholt
b980207707
Test that discard only appears in the fragment shader.
...
Fixes fragmentOnly4.vert.
2010-03-30 23:40:14 -10:00
Eric Anholt
174cc03edc
Test that main doesn't take any parameters.
...
Fixes main2.vert.
2010-03-30 23:37:51 -10:00
Eric Anholt
aad7c77937
Test that a non-void function returns a value.
2010-03-30 23:30:11 -10:00
Eric Anholt
ab79d4ec6e
Test that a void function doesn't return a value.
...
Fixes function1.frag.
2010-03-30 23:28:17 -10:00
Eric Anholt
794ea61006
Fix unused variable warning.
2010-03-30 18:31:32 -10:00
Ian Romanick
a80cbd6d82
Forbid array comparisons in GLSL 1.10
...
This causes the following tests to pass:
glslparsertest/shaders/array3.frag
2010-03-30 17:04:48 -07:00
Ian Romanick
28009cd75c
Begin handling array declarations
...
This causes the following tests to pass:
glslparsertest/shaders/array4.frag
glslparsertest/shaders/array5.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/array3.frag
2010-03-30 16:59:47 -07:00
Ian Romanick
548a1b5ab7
Implement array type handling
...
Since all glsl_type objects are flyweights, support is added to track all
known array types. This accounts for most of the changes.
2010-03-30 16:58:19 -07:00
Ian Romanick
066304679c
Add proper wrappers so that C++ code can use hash_table type
2010-03-30 16:57:29 -07:00
Ian Romanick
1cf43a4331
Initial bits of constant expression evaluator
...
Currently only works for constants. The rest will be added later.
2010-03-30 16:56:50 -07:00
Ian Romanick
84960f01cb
Add some array declaration tests
2010-03-30 16:56:22 -07:00
Ian Romanick
2d816204c8
Arrays are not allowed as vertex shader inputs in GLSL 1.30 either
2010-03-29 17:42:43 -07:00
Ian Romanick
8901eeefc9
Add several tests for vertex shader attributes
2010-03-29 17:19:13 -07:00
Ian Romanick
fb9f5b0675
Add some checking for vertex shader inputs / attributes
...
This causes the following tests to pass:
glslparsertest/shaders/attribute.vert
glslparsertest/shaders/attribute1.vert
glslparsertest/shaders/attribute2.vert
2010-03-29 17:16:35 -07:00
Ian Romanick
06e5308e29
Add parser support for texture rectangle types
2010-03-29 16:44:29 -07:00
Ian Romanick
bfb09c2a94
Use call-by-reference for apply_implicit_conversion
...
I'm not sure if this is a win or not. It makes the code in
apply_implicit_conversion more clear, but it obscures the fact that it
may change the pointers.
2010-03-29 16:32:55 -07:00