Commit Graph

36351 Commits

Author SHA1 Message Date
Eric Anholt
5f38408833 Move ir_constant cloning alongside the other cloning functions. 2010-06-24 13:32:35 -07:00
Eric Anholt
ae805922b7 Don't forget to add the declaration of our temporary variable for assigns.
Otherwise, dead code elimination gets confused since it relies on
seeing decls.
2010-06-24 13:32:35 -07:00
Eric Anholt
f66ba4f357 ir_function_inlining: Re-add the "s/return/retval =/" functionality.
I ripped it out with the cloning changes yesterday, and should have
tested and noticed that there were now returns all over.
2010-06-24 13:32:35 -07:00
Eric Anholt
1b2bcf7913 Fix variable remapping in function cloning.
It's (ht, data, key) not (ht, key, data).
2010-06-24 13:32:35 -07:00
Carl Worth
26bbfb7917 glsl2 main: Switch from realloc to talloc_realloc to construct program source.
This closes 1 leak in the glsl-orangebook-ch06-bump.frag test leaving
4 to go, (all of which are inside hash_table.c).
2010-06-23 19:09:56 -07:00
Carl Worth
b3bd77da56 glsl_type: Add a talloc-based new
And hook it up at the two sites it's called.

Note that with this change we still don't use glsl_type* objects as
talloc contexts, (see things like get_array_instance that accept both
a talloc 'ctx' as well as a glsl_type*). The reason for this is that
the code is still using many instance of glsl_type objects not created
with new.

This closes 3 leaks in the glsl-orangebook-ch06-bump.frag test:

	total heap usage: 55,623 allocs, 55,618

Leaving only 5 leaks to go.
2010-06-23 19:04:45 -07:00
Carl Worth
12c411504c Close memory leaks in glsl_type (constructor and get_array_instance)
Add a talloc ctx to both get_array_instance and the glsl_type
constructor in order to be able to call talloc_size instead of
malloc.

This fix now makes glsl-orangebook-ch06-bump.frag 99.99% leak free:

	total heap usage: 55,623 allocs, 55,615

Only 8 missing frees now.
2010-06-23 19:00:42 -07:00
Carl Worth
dc5811fd0c Close memory leak in lexer.
Simply call talloc_strdup rather than strdup, (using the talloc_parent
of our 'state' object, (known here as yyextra).

This fix now makes glsl-orangebook-ch06-bump.frag 99.97% leak free:

	total heap usage: 55,623 allocs, 55,609 frees

Only 14 missing frees now.
2010-06-23 19:00:42 -07:00
Carl Worth
a9696e79fb main: Close memory leak of shader string from load_text_file.
Could have just added a call to free() to main, but since we're using
talloc everywhere else, we might as well just use it here too. So pass
a new 'ctx' argument to load_text_file.

This removes a single memory leak from all invocations of the
standalone glsl compiler.
2010-06-23 19:00:42 -07:00
Carl Worth
007efe50fd s_symbol: Close memory leak of symbol name.
Easily done now that s_expression is allocated with talloc. Simply
switch from new to talloc_strdup and the job is done.

This closes the great majority (11263) of the remaining leaks in the
glsl-orangebook-ch06-bump.frag test:

	total heap usage: 55,623 allocs, 55,546 frees
	(was 44,283 frees)

This test is now 99.86% leak-free.
2010-06-23 19:00:42 -07:00
Carl Worth
e01193af32 Close memory leak in ir_call::get_error_instruction.
By propagating a 'ctx' parameter through these calls.

This fix happens to have no impact on glsl-orangebook-ch06-bump.frag,
(since it doesn't trigger any errors).
2010-06-23 19:00:42 -07:00
Carl Worth
522de3f5ec Close memory leaks from generate_constructor_intro
By simply propagating a 'ctx' parameter through these function
calls. (We do this because these function are otherwise only receiving
an exec_list, which is not a valid talloc context.)

This closes 1611 leaks in the glsl-orangebook-ch06-bump.frag test:

	total heap usage: 55,623 allocs, 44,283 frees
	(was 42,672 frees)
2010-06-23 19:00:42 -07:00
Carl Worth
1660a29547 exec_node: Add new talloc-based new()
And fix all callers to use the tallbac-based new for exec_node
construction. We make ready use of talloc_parent in order to get
valid, (and appropriate) talloc owners for everything we construct
without having to add new 'ctx' parameters up and down all the call
trees.

This closes the majority of the memory leaks in the
glsl-orangebook-ch06-bump.frag test:

	total heap usage: 55,623 allocs, 42,672 frees
	(was 14,533 frees)

Now 76.7% leak-free. Woo-hoo!
2010-06-23 18:59:35 -07:00
Carl Worth
8f52c9b5fc ast_node: Add new talloc-based new()
And use the talloc-based new for all of the ast objects created by the
parser.  This closes a lot of memory leaks, and will allow us to use
these ast objects as talloc parents in the future, (for things like
exec_nodes, etc.).

This closes 164 leaks in the glsl-orangebook-ch06-bump.frag test:

	total heap usage: 55,623 allocs, 14,553 frees
	(was 14,389 frees)
2010-06-23 18:15:28 -07:00
Carl Worth
015b3a5115 exec_node: Remove destructor from exec_node and all descendants.
Two of these destructors are non-empty, (s_symbol and s_list), so this
commit could potentially introduce memory leaks, (though, no additional
leaks are found in glsl-orangebook-ch06-bump.frag at least---perhaps
the current code is never calling delete on these classes?).

Going forward, we will switch to talloc for exec_node so we won't need
explicit destrcutors to free up any memory used.
2010-06-23 16:38:05 -07:00
Carl Worth
f961e4458f glsl_symbol_table: Add new talloc-based new()
We take advantage of overloading of the new operator (with an
additional parameter!) to make this look as "C++ like" as possible.

This closes 507 memory leaks when compiling glsl-orangebook-ch06-bump.frag
when measured with:

	valgrind ./glsl glsl-orangebook-ch06-bump.frag

as seen here:

	total heap usage: 55,623 allocs, 14,389 frees
	(was 13,882 frees before)
2010-06-23 16:35:45 -07:00
Carl Worth
2d2561ef96 glsl2 main: Use talloc to allocate _mesa_glsl_parse_state
This is a short-lived object. It exists only for the duration of the
compile_shader() function, (as opposed to the shader and whole_program
which live longer).

The state is created with the same talloc parent as the shader, so
that other allocation can be done with talloc_parent(state) as the
owner in order to attach to a long-lived object.
2010-06-23 16:18:13 -07:00
Carl Worth
be83eb8671 glsl2 main: Use talloc to allocate whole_program struct.
This way, whole_program can be our top-level talloc context object,
allowing us to free the lot with a single talloc_free in the end.
2010-06-23 16:18:13 -07:00
Carl Worth
4b2d32b5b5 ast_node: Remove empty destructor.
This wasn't serving any purpose. So delete it.
2010-06-23 16:16:32 -07:00
Carl Worth
c42e64099b preprocessor: Initialize a potentially uninitialized variable.
My current reading of the relevant static functions suggests that last
is never used without being uninitialized, (we only use it if the
expansion function returned non-NULL and the expansion functions
always set it before returning non-NULL).

Apparently gcc isn't coming to the same conclusion. Initializing this
to NULL nicely quites gcc and will guarantee a nice, early segfault if
my anaylsis turns out to be wrong.
2010-06-23 16:13:31 -07:00
Carl Worth
726faddda2 preprocessor: Remove dead code _token_list_length
As gcc noticed, this function is not currently being used. Good-bye.
2010-06-23 16:13:31 -07:00
Carl Worth
45cbc08438 preprocessor: Remove dead code _string_list_append_list
As gcc noticed, this function is not currently being used. Good-bye.
2010-06-23 16:13:31 -07:00
Carl Worth
60c67e46b1 configure: Ensure that config.h can be safely included multiple times.
Use AH_TOP and AH_BOTTOM macros so that the standard include guard
mechanisms are emitted by autoheader into the generated config.h file.
2010-06-23 16:13:31 -07:00
Carl Worth
a32305a8bd configure: Remove some dead code.
This block of code is useless because a (nearly-equivalent) assignment
is made immediately after. The only difference is the omission of
-Wunreadchable-code in the assignment being used. Presumably, that was
intended to be -Wunreachable-code (without the first 'd'), but since
this hasn't been being used we just drop it.
2010-06-23 16:13:31 -07:00
Carl Worth
a22426dc4c Fix typos of "variable" as "varaible"
One of these was just in a comment. But ther other was in an enum
tag, (which is apparently not being used anywhere yet).
2010-06-23 16:12:53 -07:00
Carl Worth
7fd7104fbb ir_variable: Add some missing initialization to the constructor.
Thanks to valgrind for noticing this problem.
2010-06-23 16:12:53 -07:00
Eric Anholt
a9d58ad6c9 Fix double usage of the post-inc/dec's temporary pre-inc/dec copy.
Fixes CorrectSwizzle3.frag.
2010-06-23 15:20:29 -07:00
Eric Anholt
2731a739d0 Avoid using the RHS of an assignment twice.
This would fix double-evaluation of assignment RHS expressions,
including possible side effects.
2010-06-23 15:20:29 -07:00
Eric Anholt
959a9ecdd8 get_lvalue_copy doesn't need all the checking of do_assignment(). 2010-06-23 15:20:29 -07:00
Eric Anholt
3e24ef68a9 ast_to_hir: Clone LHS derefs of assignment expressions. 2010-06-23 15:20:29 -07:00
Eric Anholt
8006576b36 ir_function_inlining: Allow inlining of loops and conditionals.
The new cloning code handles them.
2010-06-23 15:20:29 -07:00
Eric Anholt
4b6fd39c89 Add a virtual clone() method to ir_instruction.
This will be used by function inlining, the linker, and avoiding double
usage of the LHS deref chains in ++, *=, and similar operations.
2010-06-23 15:20:29 -07:00
Eric Anholt
02fc4b34e4 Avoid using the same ir_constant 0.0 multiple times in mat constructors. 2010-06-23 15:20:29 -07:00
Kenneth Graunke
bc1097d151 glcpp: Support line continuations within preprocessor directives.
Fixes CorrectPreprocess5.frag.
2010-06-23 14:14:57 -07:00
Kenneth Graunke
186e2634bf glcpp: Make standalone binary use preprocess().
This prevents the two code paths from getting out of sync.  Also, future
work will need the shader source as a string anyway.

Unfortunately, this copies and pastes load_text_file from main.cpp, with
small changes (support for reading from stdin, talloc).
2010-06-23 14:14:57 -07:00
Kenneth Graunke
12a820c9d8 glcpp: Fix "dangerous trailing context" warning.
Flex couldn't be sure whether "def" and "ndef" were part of the #ifdef
and #ifndef patterns or the trailing context of the #if pattern.
2010-06-23 14:14:57 -07:00
Kenneth Graunke
d07bb7b83a Remove comment support from the main lexer.
Now handled by the preprocessor.
2010-06-23 14:14:57 -07:00
Kenneth Graunke
e6ae7afc0c glcpp: Recognize plain "//" as a comment.
Found in glsl-orangebook-ch06-bump.(frag|vert).  This was resulting in
the comments getting passed through to the main compiler's lexer.
2010-06-23 14:14:57 -07:00
Ian Romanick
fa455fc2a5 Generate errors for empty constructors instead of asserting
This causes the following tests to pass:

     glslparsertest/glsl2/constructor-10.vert
2010-06-23 13:58:34 -07:00
Ian Romanick
3ed850e91c linker: Update some comments, remove a couple FINISHMEs 2010-06-23 12:18:21 -07:00
Ian Romanick
553dcdcaaf linker: Use InfoLog in assign_attribute_locations
Since the program is now passed in, refactor the parameter list to the
function as well.
2010-06-23 12:14:02 -07:00
Ian Romanick
ed1fe3db3b linker: Refactor parameters to cross_validate_uniforms 2010-06-23 12:09:14 -07:00
Ian Romanick
f36460e1a7 linker: Write errors to info log instead of stdout 2010-06-23 12:07:22 -07:00
Ian Romanick
0e59b2698a linker: Initial implementation of varying slot allocation 2010-06-23 11:24:26 -07:00
Ian Romanick
9342d269a4 linker: Limit attribute allocation to MAX_VERTEX_ATTRIBS 2010-06-23 11:24:26 -07:00
Ian Romanick
6984670f97 linker: Support matrix and array vertex inputs 2010-06-23 11:24:26 -07:00
Ian Romanick
0ad22cd1ce linker: Initial implementation of attribute slot allocation 2010-06-23 11:24:26 -07:00
Ian Romanick
a8ca9cbc69 Import some bits Mesa's mtypes.h 2010-06-23 11:24:26 -07:00
Ian Romanick
4485c5ae78 Import gl_program_parameter and gl_program_parameter_list types from Mesa 2010-06-23 11:24:26 -07:00
Ian Romanick
abee16e8cb linker: Store the par-linked per-stage shaders in the glsl_program 2010-06-23 11:24:26 -07:00