Eric Anholt
05a4e59c24
ir_to_mesa.cpp: Fix missing types on some ir_swizzles.
...
Debugging this took forever as I only looked at constructors in ir.cpp
to find who wasn't setting up ->type. I dislike hiding code (as
opposed to prototypes and definitions) in C++ header files, but in
this case I have only myself to blame.
2010-05-03 17:09:31 -07:00
Eric Anholt
3bc8b68436
Remove the pedantic C junk.
...
Mesa doesn't use pedantic ANSI C89, so I have no idea why we would.
2010-05-03 11:41:00 -07:00
Eric Anholt
3623df68fa
Store warnings and errors in a parser state infolog.
...
Cleans up compile warning about unused state in _mesa_glsl_warning. We
would want infolog handling roughly like this anyway.
2010-05-03 11:40:26 -07:00
Eric Anholt
81f49a774e
Quiet warnings about ir_shader not being handled in places it's not needed.
2010-05-03 11:40:26 -07:00
Eric Anholt
7f436a837c
Use the AM_SILENT_RULES when available.
2010-05-03 11:40:26 -07:00
Eric Anholt
a35e62d97a
glsl_lexer: Quiet warning about unused unput().
2010-05-03 11:40:25 -07:00
Ian Romanick
970353e047
Merge branch 'fixes'
2010-05-03 10:15:02 -07:00
Kenneth Graunke
b0e0da5f07
Use %p rather than %08x when printing pointers to fix compile.
2010-05-01 00:38:36 -07:00
Kenneth Graunke
05ddebac0a
Fix ir_return cloning to actually use the cloned subexpression.
...
This caused a nasty bug where the function inliner would create new
variables for each of the formal parameters, but the body would still
reference the old copies.
This was highly visible since the dead code eliminator (rightly) removed
the new declarations, leading to printed IR that referenced non-existent
variable names.
2010-05-01 00:31:35 -07:00
Kenneth Graunke
c07fdae33f
Fix incorrect comments in function inliner.
2010-04-30 23:38:50 -07:00
Eric Anholt
438f38c55a
ir_dead_code: Fix segfault on handling a return statement with no value.
2010-04-29 13:54:19 -07:00
Ian Romanick
a2c6df5566
Track and print user defined structure types
2010-04-28 18:22:54 -07:00
Ian Romanick
36d8a64a95
IR print visitor: Move logic for printing the whole program to _mesa_print_ir
2010-04-28 18:22:54 -07:00
Ian Romanick
7d82c765a8
IR print visitor: Just print the name of structures
...
Treat structure types like other non-array types. We'll have to print
the structure defintion elsewhere.
2010-04-28 18:22:54 -07:00
Eric Anholt
35e8e461ca
ir_function_inlining: Handle inlining of structure dereferences.
2010-04-28 18:22:54 -07:00
Eric Anholt
c0bfe8723e
Correctly handle remapping of array dereferences if ->var is a variable.
2010-04-28 18:22:54 -07:00
Ian Romanick
c824e35dd0
Begin handling some varieties of invalid declarations
2010-04-28 18:22:54 -07:00
Ian Romanick
ab89927a91
Reject conflicting struct declarations, generate struct constructor
2010-04-28 18:22:54 -07:00
Ian Romanick
82baaf4283
glsl_type::generate_constructor_prototype now generates the function too
...
Also, change the name of the method to generate_constructor.
2010-04-28 18:22:54 -07:00
Ian Romanick
85ba37b97d
Always return a value from ast_type_specifier::hir
2010-04-28 18:22:54 -07:00
Ian Romanick
8bec5e92e0
Support structures in glsl_type::generate_constructor_prototype
2010-04-28 18:22:54 -07:00
Ian Romanick
ae000fcb2e
Implement structures and arrays in ir_dereference::is_lvalue
2010-04-28 18:22:54 -07:00
Ian Romanick
73986a7a26
Ensure that structure fields have non-NULL types
2010-04-28 18:22:54 -07:00
Ian Romanick
1d28b617ba
Ensure that anonymous structures have non-NULL names
2010-04-28 18:22:54 -07:00
Ian Romanick
6efaeeea44
Convert structure field dereferences to HIR
2010-04-28 18:22:54 -07:00
Ian Romanick
7ee79fb6b7
Add ir_dereference constructor for structure field dereferences
2010-04-28 18:22:54 -07:00
Ian Romanick
8f755dcb67
Add glsl_type::field_type
...
Query the type of a structure field
2010-04-28 18:22:54 -07:00
Ian Romanick
3455ce6144
Begin converting structure definitions to IR
2010-04-28 18:22:53 -07:00
Ian Romanick
1f959ab4d6
Use IDENTIFIER instead of TYPE_NAME for structure names
...
Since there is no track of which names are structure names during parsing,
TYPE_NAME cannot be produced by the lexer. Use IDENTIFIER and let the AST
processor sort it out.
2010-04-28 18:22:47 -07:00
Kenneth Graunke
bf783ecea6
ir_reader: Slightly better error message when failing to read swizzles.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
92eb64cd33
ir_reader: Don't print out the S-Expression.
...
It's no longer useful for debugging.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
b51557fbe2
ir_reader: Read function calls.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
b142aeeb20
ir_reader: Replace function prototypes with the definition.
...
Previously, we just created a new one, which was wrong.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
21128c23c6
ir_reader: Fix incorrect error message for expressions.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
46a223224c
Make ir_read_error print out the given S-Expression, for context.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
951632253f
ir_reader: Fix for swizzles.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
8df335d7f9
ir_reader: Preliminary work toward reading functions.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
09cad1339d
ir_reader: Perform a preliminary pass to scan for function prototypes.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
ddf5a011e2
ir_reader: Don't initialize globals, builtins, or constructors.
...
All of these are currently emitted as part of the IR, so by initializing
them, we actually end up with two copies. For constructors, we may
eventually wish to avoid emitting them as part of the IR output.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
4ec982fb86
Make ir_read_error set state->error.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
396fa9eba6
ir_reader: Add support for "break" and "continue" in loops.
...
Includes threading the ir_loop * context through various functions.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
32b305207c
ir_reader: Add initial loop support; doesn't yet support break/continue.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
451381c220
ir_reader: Add support for reading (var_ref ...) and (array_ref ...)
2010-04-28 18:14:54 -07:00
Kenneth Graunke
46ef8f19d7
ir_reader: rvalues are instructions too!
2010-04-28 18:14:54 -07:00
Kenneth Graunke
3ea0582803
ir_reader: Add support for reading conditionals: (if ...)
2010-04-28 18:14:54 -07:00
Kenneth Graunke
5794497542
ir_reader: Add support for reading array types.
...
Also, constify glsl_type pointers; this was necessary to use
glsl_type::get_array_instance.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
9d2ff7617a
ir_reader: Add support for reading (return ...)
2010-04-28 18:14:54 -07:00
Kenneth Graunke
d1d2ada3c6
ir_reader: Add support for reading variable declarations.
...
It also now reads a list of instructions, as it should, rather than a
single rvalue.
2010-04-28 18:14:54 -07:00
Kenneth Graunke
f955649af3
Partial IR reader.
...
Currently reads assignments, constants, expressions, and swizzles.
2010-04-28 18:14:53 -07:00
Kenneth Graunke
e8b399270d
Set language_version to 130 (the max currently supported) when reading IR.
...
This is necessary so _mesa_glsl_initialize_types can create appropriate
glsl_types and add them to the symbol table.
In the future, we'll want to set it to the max GLSL version supported by
the current driver.
2010-04-28 18:14:53 -07:00
