summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-07-21glsl: Correctly handle unary plus operator.glsl2Carl Worth1-3/+3
Previously, any occurence of the unary plus operator would trigger a bogus type mismatch error. Fix this by making the ast_plus case look more like the ast_neg case as far as type-checking is concerned. With this change the shaders/CorrectPreprocess8.frag test in piglit now passes.
2010-07-20glcpp: Avoid accidental token pasting in preprocessed result.Carl Worth5-5/+43
Consider this test case: #define EMPTY int foo = 1+EMPTY+4; The expression should compile as the sequence of tokens 1, PLUS, UNARY_POSITIVE, 4. But glcpp has been failing for this case since it results in the string "1++4" which a compiler correctly sees as a syntax error, (1, POST_INCREMENT, 4). We fix this by changing any macro with an empty definition to result in a single SPACE token rather than nothing. This then gives "1+ +4" which compiles correctly. This commit does touch up the two existing test cases which already have empty macros, (to add the space to the expected result). It also adds a new test case to exercise the above scenario.
2010-07-20glcpp: Add missing include in xtalloc.cCarl Worth1-1/+1
Without this, the compiler was legitimately complaining about missing declarations for all of the functions being defined here.
2010-07-20glcpp: Add static keyword to several functions in the parser.Carl Worth1-3/+3
This quiets warnings about missing declarations otherwise.
2010-07-20glcpp: Avoid warnings in generated flex code.Carl Worth1-1/+12
We define the YY_NO_INPUT macro to avoid one needless function being generated. for the other needless functions, (yyunput and yy_top_state), we add a new UNREACHABLE start condition and call these functions from an action there. This doesn't change functionality at all, (since we never enter the UNREACHABLE start condition), but makes the compiler stop complaining about these two functions being defined but not used.
2010-07-20glcpp-lex: Declare some generated functions to eliminate compiler warnings.Carl Worth1-0/+5
It's really a bug in flex that these functions are generated with neither a declaration nor the 'static' keyword, but we can at least avoid the warnings this way.
2010-07-20glcpp: Fix support for nested #ifdef and nested #ifndefCarl Worth3-2/+85
Previously, if the outer #ifdef/#ifndef evaluated to false, the inner directive would not be parsed correctly, (the identifier as the subject of the #ifdef/#ifndef would inadvertently be skipped along with the other content correctly being skipped). We fix this by setting the lexing_if state in each case here. We also add a new test to the test suite to ensure that this case is tested.
2010-07-20glcpp: Support #if(expression) with no intervening space.Carl Worth3-1/+8
And add a test case to ensure that this works.
2010-07-20glcpp: Fix use-after-free error from #undef directive.Carl Worth1-4/+1
By taking advantage of the recently-added hash_table_remove function. With this change, all existing tests are now valgrind-clean.
2010-07-20hash_table: Add new hash_table_remove function.Carl Worth2-0/+21
To allow for the removal of a single element from a hash table.
2010-07-20glcpp: Make test suite test for valgrind cleanliness.Carl Worth1-1/+21
As it turns out, 4 of our current tests are not valgrind clean, (use after free errors or so), so this will be helpful for investigating and fixing those.
2010-07-20glcpp: Make test suite report final count of passed/total tests.Carl Worth1-2/+22
And report PASS or FAIL for each test along the way as well.
2010-07-20Build a standalone glcpp binary.Carl Worth1-3/+17
This is convenient for testing the preprocessor independent of the rest of mesa, (just run glcpp-test in the src/glsl/glcpp/tests).
2010-07-20glcpp: Delete copies of hash_table.c, hash_table.h, and other headers.Carl Worth5-526/+0
These were only ever intended to exist in the original, standalone implementation of glcpp, (with the idea of dropping them as soon as the code moved into mesa). The current build system wasn't compiling this C file, but the presence of the header files could cause problems if the two copies diverge in the future. We head those problems off by deleting al of these redundant files.
2010-07-20glsl2: Add definitions of the builtin constants present in GLSL 1.10.Eric Anholt4-9/+77
Fixes: glsl1-built-in constants
2010-07-20glsl2: Fix asin() implementation.Eric Anholt2-122/+138
I'd flipped around the order of two operations in paren-balancing adventures, and left out the multiply by sign(x) required for negative x. Fixes: glsl1-acos(vec4) function glsl1-asin(vec4) function glsl1-atan(vec4) function
2010-07-20glsl2: notEqual() produces a boolean value, not the base type of the args.Eric Anholt2-36/+36
Fixes: glsl1-vector relational (bvec2 ==,!=) glsl1-vector relational (vec4 !=)
2010-07-20glsl2: Constant-fold assignment conditions.Eric Anholt1-0/+13
2010-07-20glsl2: Don't validate IR if there were compilation errorsIan Romanick1-3/+3
2010-07-20ir_to_mesa: Fix swizzled writemasks with swapped component ordering.Eric Anholt1-34/+27
I hadn't noticed you could do this, but glsl1 tests caught it. Fixes: glsl1-Swizzled writemask glsl1-Swizzled writemask (2) glsl1-Swizzled writemask (rgba) glsl1-Swizzled writemask (stpq)
2010-07-19linker: Remove the FINISHME comment for intrastage linkingIan Romanick1-1/+2
2010-07-19linker: Remove redundant check for 'main' in shadersIan Romanick1-10/+0
This is now handled in link_intrastage_shaders.
2010-07-19linker: Track and validate GLSL versions used in shadersIan Romanick4-0/+27
2010-07-19glsl2: Use Elements macroIan Romanick2-11/+18
2010-07-19linker: Recursively resolve function calls in imported functionsIan Romanick1-3/+46
2010-07-19linker: look up function signatures during linking instead of using calleeIan Romanick1-24/+59
Instead of using ir_call::callee, search for the signature in the linked shader. This will allow resolving calls from functions imported from other shaders. The ir_call::callee pointer in the imported function will still reference a signature in the original shader.
2010-07-19linker: Pull find_matching_signature out of call_link_visitorIan Romanick1-21/+27
The list of shaders to search needs to be provided as an explicit parameter to support coming changes. At that point there is no reason for it to be in the class. Also, fix some of the 'const' decorators.
2010-07-19glsl2: Explicitly walk lists in ir_function::parameter_lists_matchIan Romanick2-25/+23
Give ir_function::parameter_lists_match_exist similar treatment. Make the parameters const, and propogate the constness as far as it will trivially go.
2010-07-19linker: Add comment about bug in initializer handlingIan Romanick1-0/+8
2010-07-19linker: First bits of intrastage, intershader function linkingIan Romanick4-0/+214
This handles the easy case of linking a function in a different compilation unit that doesn't call any functions or reference any global variables.
2010-07-19ir_function_signature: Make actual_parameters publicIan Romanick1-3/+3
2010-07-19linker: Remove some unnecessary includesIan Romanick1-2/+0
2010-07-19exec_list: Fix foreach_list_safe.Kenneth Graunke2-13/+8
It now works correctly when nodes are removed, as it was originally intended to do; it no longer processes nodes added to the list before the current node, nor those added immediately after the current node. This matches the behavior of Linux's list_for_each_safe.
2010-07-19linker: Use foreach_list_safe in move_non_declarationsIan Romanick1-1/+1
The node being processed may be removed from the list and put in a different list. Not using the safe version caused list processing to change streams after moving a node.
2010-07-19linker: Move global instructions from the linked shader firstIan Romanick1-4/+8
For the shader containing 'main', use the linked shader (i.e., the clone of the original shader that contained main) as the source for global instructions to move into main.
2010-07-19glsl2: Fix lexing of octal values, including "0".Eric Anholt1-1/+1
When faced with a constructor like 'ivec4(0, 2, 0, 0)', we would manage to get a value of 2 instead of 0 for the first "0". Usually 2 characters past "0" would point at some junk and lex as 0 anyway. Fixes glsl-octal and glsl-unused-varyings.
2010-07-19glsl2: Fix the expression type for atan's pi * sign(y).Eric Anholt2-8/+8
Fixes CorrectFunction.vert.
2010-07-19i915: Ask the compiler to flatten out all the if statements that it can.Eric Anholt4-1/+20
2010-07-19glsl2: Add a pass for converting if statements to conditional assignment.Eric Anholt3-0/+169
This will be used on 915 and similar hardware of that generation.
2010-07-19glsl2: Give IR nodes a type field.Eric Anholt3-10/+70
This is a big deal for debugging if nothing else ("what class is this ir_instruction, really?"), but is also nice for avoiding building a whole visitor or an if (node->as_whatever() || node->as_other_thing()) chain.
2010-07-19ir_to_mesa: Do validation on the IR tree.Eric Anholt1-0/+4
2010-07-19ir_to_mesa: Don't do lowering passes on an errored-out shader.Eric Anholt1-6/+6
2010-07-18ir_to_mesa: Rename struct temp_entry, which is used for all variables now.Eric Anholt1-35/+36
2010-07-18ir_to_mesa: Add support for function calls.Eric Anholt1-6/+227
Unlike the previous compiler, in this case we emit only one copy of the function regardless of how many times it's called.
2010-07-18glsl2: Remove the const disease from function signature's callee.Eric Anholt5-9/+8
2010-07-18glsl2: Make cross() be an expression operation.Eric Anholt6-22/+21
ARB_fp, ARB_vp, Mesa IR, and the 965 vertex shader all have instructions for cross. Shaves 12 Mesa instructions off of a 66-instruction shader I have.
2010-07-18glsl2: Fix warning from always-false assert not being known to not return.Eric Anholt1-0/+1
2010-07-14ast_function: Actually do type conversion on function arguments.Kenneth Graunke1-3/+8
2010-07-14exec_list: Add a new replace_with method.Kenneth Graunke1-0/+11
2010-07-14Refresh autogenerated file builtin_function.cpp.Kenneth Graunke1-189/+27