summaryrefslogtreecommitdiff
path: root/src/glsl/glcpp
AgeCommit message (Collapse)Author
2010-08-11glcpp-test: Capture the stderr output of the preprocessor.Carl Worth
This allows writing tests that verify diagnostics from the preprocessor.
2010-08-11glsl2: move declarations before codeBrian Paul
2010-08-11glcpp: Clean up intermediate file when test suite is interrupted.Carl Worth
The glcpp-test script was leaving around bogus *.valgrind-errors files if a valgrind test was interrupted.
2010-08-11glcpp: Regenerate glcpp-parse.cCarl Worth
After a recent change to glcpp-parse.y
2010-08-11glcpp: Additional fixes for not evaluating skipped #if/#elif expressions.Carl Worth
This adds a couple of test cases to expand our coverage of invalid #if and being skipped, (either by being nested inside an #if/#elif that evaluates to zero or by being after an #if/#elif that evaluates to non-zero).
2010-08-10glcpp/tests: Commit forgotten file 074-elif-undef.c.expected.Kenneth Graunke
2010-08-10glcpp: Discard output of cmp when running the test suite.Carl Worth
We're already using the return-value of cmp to print either PASS or FAIL and in the case of failure, we're subsequently running and showing the output of diff. So any warnings/errors from cmp itself are not actually needed, and can be quite confusing.
2010-08-10glcpp: Fix expected result for the 064-version.c test.Carl Worth
Commit d4a04f315560704bf1103df0b93723e468725df7 caused this test case to produce an additional blank line, which is otherwise harmless, but does need to be reflected in the .expected file for the test to pass.
2010-08-10glcpp: Regnerate glcpp-parse.c and glcpp-parse.hCarl Worth
After making a minor change to the .y file.
2010-08-10glcpp: Initialize location structure at beginning of parse.Carl Worth
Since we have a custom structure for YYLTYPE locations, we need to use an %initial-action directive to avoid triggering use of uninitialized memory when, for example, printing error messages. We apparently don't yet have a test case that allowed valgrind to find this bug for us, but valgrind found a similar problem in the other parser, so we fix this one as well.
2010-08-04glcpp: Ignore #if and #elif expressions when skipping.Kenneth Graunke
Fixes glcpp test cases 073 and 074, as well as piglit test xonotic-vs-generic-diffuse.vert.
2010-08-04glcpp/tests: Add a corollary to testcase 073 for testing #elif.Kenneth Graunke
2010-08-04glcpp/tests: Fix 073-if-in-ifdef.c to use #ifdef, not #if.Kenneth Graunke
The original intention was to use #ifdef.
2010-08-04glcpp: Refactor HASH_IF and HASH_ELIF expansion to reuse code.Kenneth Graunke
2010-08-04glcpp: Refresh autogenerated lexer and parser.Kenneth Graunke
2010-08-04glcpp: Remove xtalloc wrappers in favor of plain talloc.Kenneth Graunke
Calling exit() on a memory failure probably made sense for the standalone preprocessor, but doesn't seem too appealing as part of the GL library. Also, we don't use it in the main compiler.
2010-08-02glsl2: Give the path within src/mesa/ for headers instead of relying on -I.Aras Pranckevicius
2010-08-01glcpp: Add a testcase for the failure in compiling xonotic's shader.Eric Anholt
gcc and mesa master agree that this is OK.
2010-07-30glcpp: Don't look for backslashes before the beginning of the string.Kenneth Graunke
Fixes a valgrind error.
2010-07-28glsl2: Actually fix glsl-version-define.Eric Anholt
2010-07-28glcpp: Add __VERSION__ define to the current language version.Eric Anholt
Fixes: glsl-version-define glsl-version-define-110 glsl-version-define-120
2010-07-28glcpp: Print integer tokens as decimal, not hex.Eric Anholt
2010-07-28glsl2: Add the define for ARB_fragment_coord_conventions when present.Eric Anholt
Fixes: glsl-arb-fragment-coord-conventions-define
2010-07-28glcpp: Add generated source files.Carl Worth
This is now consistent with other usage of flex/bison througout mesa, (which is that these generated files are added to source control so that the build system does not require external tools like flex/bison for non-developers).
2010-07-28glcpp: Add expected output for a recently-added test.Carl Worth
I simply forgot to add this file when adding the test case originally.
2010-07-28glcpp: Explicitly expect 0 shift/reduce conflicts.Carl Worth
The "%expect 0" construct will make bison emit an error if any future changes to the grammar introduce shift/reduce conflicts, (without also increasing the number after "%expect").
2010-07-28glcpp: Remove 2 shift/reduce conflicts from the grammar.Carl Worth
Since we have productions to turn "defined FOO" and "defined ( FOO )" into a conditional_token we don't need to list DEFINED as an operator as well. Doing so just introduces the shift/reduce ambiguity with no benefit.
2010-07-22glcpp: Fix function-like macros with an argument used multiple times.Carl Worth
It's really hard to believe that this case has been broken, but apparently no test previously exercised it. So this commit adds such a test and fixes it by making a copy of the argument token-list before expanding it. This fix causes the following glean tests to now pass: glsl1-Preprocessor test 6 (#if 0, #define macro) glsl1-Preprocessor test 7 (multi-line #define)
2010-07-21glsl: Fix missing initialization of yylloc.sourceCarl Worth
In both the preprocessor and in the compiler proper, we use a custom yyltype struct to allow tracking the source-string number in addition to line and column. However, we were previously relying on bison's default initialization of the yyltype struct which of course is not aware of the source field and leaves it uninitialized. We fix this by defining our own YYLLOC_DEFAULT macro expanding on the default version (as appears in the bison manual) and adding initialization of yylloc.source.
2010-07-20glcpp: Avoid accidental token pasting in preprocessed result.Carl Worth
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 Worth
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 Worth
This quiets warnings about missing declarations otherwise.
2010-07-20glcpp: Avoid warnings in generated flex code.Carl Worth
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 Worth
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 Worth
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 Worth
And add a test case to ensure that this works.
2010-07-20glcpp: Fix use-after-free error from #undef directive.Carl Worth
By taking advantage of the recently-added hash_table_remove function. With this change, all existing tests are now valgrind-clean.
2010-07-20glcpp: Make test suite test for valgrind cleanliness.Carl Worth
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 Worth
And report PASS or FAIL for each test along the way as well.
2010-07-20glcpp: Delete copies of hash_table.c, hash_table.h, and other headers.Carl Worth
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-07glsl2: Initialize yylineno and yycolumn so line numbers are sane.Kenneth Graunke
2010-07-02glcpp: Add #error support.Kenneth Graunke
2010-07-01glsl2: Conditionally define preprocessor tokens for optional extensionsIan Romanick
The only optional extension currently supported by the compiler is GL_EXT_texture_array.
2010-07-01glsl2: Define preprocessor tokens for extensionsIan Romanick
Currently only GL_ARB_draw_buffers and GL_ARB_texture_rectangle are defined because those extensions are always enabled. This make tex_rect-03.frag pass.
2010-06-24glsl2: Move the compiler to the subdirectory it will live in in Mesa.Eric Anholt