diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2009-11-06 11:17:00 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-11-06 11:17:00 -0800 |
commit | 4e4c2ee1fd574d1d651c559f46afb6ca5487156d (patch) | |
tree | bac4ff3a1bd0580ff321cac44d5eed9fd347694c /src/mesa/main/remap_helper.h | |
parent | 96e938f62c729fab74601627d54c9c4cf499ebdf (diff) | |
parent | 9348ac03ce23392013ba22c22a182eea4453027a (diff) |
Merge branch 'mesa_7_6_branch'
This should fix the memory leaks in the assembly parser without the
regressions.
The conflicts in program_lexer.l were related to changes in returning
strings between the branches (always return IDENTIFIER vs. returing
either IDENTIFIER or USED_IDENTIFIER).
The conflicts in program_parse.y were related to two changes in master
One change prints a variable name in an error message. The other
change adds outputVarSize to the OUTPUT_statement rule. The cause the
position of the IDENTIFIER to change from $2 to $3.
Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_lexer.l
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.y
Diffstat (limited to 'src/mesa/main/remap_helper.h')
0 files changed, 0 insertions, 0 deletions