summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix an MSVC build error (bugzilla 29570).Vinson Lee2010-08-131-1/+1
|
* glsl2: Remove unnecessary use of 'struct' before type namesIan Romanick2010-08-136-58/+57
| | | | | | | | In C++ you don't have to say 'struct' or 'class' if the declaration of the type has been seen. Some compilers will complain if you use 'struct' when 'class' should have been used and vice versa. Fixes bugzilla #29539.
* Add missing intmax_t and uintmax_tIan Romanick2010-08-131-0/+3
|
* glsl2: Use stdint.h instead of inttypes.hIan Romanick2010-08-134-4/+4
|
* glsl2: Commit generated file changed by previous commitIan Romanick2010-08-131-55/+47
|
* glsl2: Use --nounistd to fix MSVC buildIan Romanick2010-08-132-2/+3
| | | | | Also remove the --never-interactive command line option for the preprocessor lexer. This was already done for main compiler lexer.
* linker: Assign attrib location 0 if gl_Vertex is not usedIan Romanick2010-08-131-1/+36
| | | | | | | If gl_Vertex is not used in the shader, then attribute location 0 is available for use. Fixes piglit test case glsl-getattriblocation (bugzilla #29540).
* glsl2: Include string.h in preprocessorJakob Bornecrantz2010-08-131-0/+1
|
* glsl2: Commit generated files changed by previous two commitsIan Romanick2010-08-133-1403/+1314
|
* glsl2: Avoid token name collisions with names used by Windows header filesIan Romanick2010-08-132-31/+31
|
* glsl2: Eliminate tokens for square matrix short namesIan Romanick2010-08-132-7/+4
| | | | | | MAT2 and MAT2X2, for example, are treated identically by the parser. The language version based error checking (becuase mat2x2 is not available in GLSL 1.10) is already done in the lexer.
* scons: Build the new glsl2 code.José Fonseca2010-08-134-65/+78
|
* talloc: Make it compile with MSVC, MinGW, and Xcode/gcc4.0.José Fonseca2010-08-134-3/+129
| | | | Based on Aras Pranckevičius' patch.
* talloc: Import 2.0.1 code.José Fonseca2010-08-135-0/+3792
|
* glsl2: Use MIN2 from macros.h instead of open coding itIan Romanick2010-08-121-11/+7
|
* glsl2: Use Elements from main/compiler.h instead of open-codingIan Romanick2010-08-126-16/+5
|
* mesa: check for null shader->InfoLog before printingBrian Paul2010-08-121-1/+3
|
* glsl2: Commit generated file changed by previous commitIan Romanick2010-08-121-0/+1
|
* glsl2: Add missing include of string.hIan Romanick2010-08-121-107/+108
| | | | Makes the build happy on non-GCC platforms.
* gallium: Link DRI drivers with g++ and test with CXXJakob Bornecrantz2010-08-121-8/+5
| | | | | New shader compiler need libc++ runtime. This works already if we are using llvm so this just covers the !llvm case.
* glsl2: Change command line options passed to flexIan Romanick2010-08-111-1/+1
| | | | | | | | | Remove --never-interactive because it is already specified in the source using %option. Use -o instead of --outfile. Some of the %option commands may also need to be removed for compatibility with older versions (e.g., 2.5.4) of flex. This should fix bugzilla #29209.
* glsl2: Commit generated files changed by previous commitIan Romanick2010-08-112-249/+249
|
* glsl2: Use bison command line option to set prefixIan Romanick2010-08-112-2/+1
| | | | | | Bison version 2.3 doesn't seem to support %name-prefix in the source. This should fix bugzilla #29207.
* glsl2: Commit generated files changed by previous commitIan Romanick2010-08-113-1259/+1287
|
* glsl2: Emit error from lexer when illegal reserved word is encounteredIan Romanick2010-08-112-41/+53
| | | | | | | | Without this, the parser will generate obtuse, useless error diagnostics when reservered word that are not used by the grammar are encountered in a shader. Fixes bugzilla #29519.
* glsl2: Don't declare a variable called sig that shadows the other oneIan Romanick2010-08-111-1/+1
| | | | | | | | | Accidentally having a variable called 'sig' within an if-statement cause the higher scope 'sig' to always be NULL. As a result a new function signature was created for a function definition even when one already existed from a prototype declaration. Fixes piglit test case glsl-function-prototype (bugzilla #29520).
* glcpp: Fix "unterminated if" diagnostic.Carl Worth2010-08-114-4/+8
| | | | | | | | | | | This was previously being appended to the output string *after* a copy of the supposedly final string was made and handed to the caller. So the diagnostic was never actually visible to the user. We fix this by moving the check for an unterminated #if from glcpp_parser_destroy to the calling function, preprocess. This fixes the test case 083-unterminated-if.c.
* glccp: Regenerate glcpp-parse.cCarl Worth2010-08-111-376/+393
| | | | Due to a recent change to glcpp-parse.y.
* glcpp: Add an explicit diagnostic for #if with no expression.Carl Worth2010-08-112-1/+14
| | | | | | | This is more clear than the previously-generated diagnostic which was something confusing like "enexpected newline". This change makse test 080-if-witout-expression.c now pass.
* glcpp: Reword diagnostic for #elif with no expressionCarl Worth2010-08-113-3/+2
| | | | | | Rather than telling the user what to fix, the standard convention is to describe what the detected problem is. With this change, test 081-elif-without-expression now passes.
* glcpp: Add several tests for diagnostics.Carl Worth2010-08-1120-0/+72
| | | | | | Which are proving to be useful since some of these tests are not yet acting as desired, (in particular, the unterminated if test is not generating any diagnostic).
* glcpp: Regenerate glcpp-lex.cCarl Worth2010-08-111-9/+23
| | | | After a recent change to glcpp-lex.l
* glcpp: Initialize line and column numbers to 1, not 0.Carl Worth2010-08-111-1/+1
| | | | | Error messages make more sense this way since the convention is for the first line of a file to be numbered from 1, rather than 0.
* glcpp-test: Capture the stderr output of the preprocessor.Carl Worth2010-08-111-1/+1
| | | | This allows writing tests that verify diagnostics from the preprocessor.
* configs: added -ltalloc to config filesBrian Paul2010-08-112-2/+2
|
* osmesa: link with new libglsl.a libBrian Paul2010-08-111-2/+1
|
* glsl2: added casts to silence warningsBrian Paul2010-08-113-12/+12
|
* glsl2: remove stray semicolonBrian Paul2010-08-111-1/+1
|
* glsl2: added casts to silence warningsBrian Paul2010-08-111-4/+4
|
* glsl2: add cast to silence warningBrian Paul2010-08-111-1/+1
|
* glsl2: remove stray semicolonBrian Paul2010-08-111-1/+1
|
* glsl2: move declarations before codeBrian Paul2010-08-111-2/+4
|
* glsl2: remove trailing comma to silence warningBrian Paul2010-08-111-1/+1
|
* glcpp: Clean up intermediate file when test suite is interrupted.Carl Worth2010-08-111-0/+2
| | | | | The glcpp-test script was leaving around bogus *.valgrind-errors files if a valgrind test was interrupted.
* glcpp: Regenerate glcpp-parse.cCarl Worth2010-08-111-111/+133
| | | | After a recent change to glcpp-parse.y
* glcpp: Additional fixes for not evaluating skipped #if/#elif expressions.Carl Worth2010-08-115-19/+61
| | | | | | 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).
* glcpp/tests: Commit forgotten file 074-elif-undef.c.expected.Kenneth Graunke2010-08-101-0/+4
|
* texture_builtins.py: Remove useless comments.Kenneth Graunke2010-08-101-2/+2
|
* glcpp: Discard output of cmp when running the test suite.Carl Worth2010-08-101-1/+1
| | | | | | | 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.
* glcpp: Fix expected result for the 064-version.c test.Carl Worth2010-08-101-0/+1
| | | | | | 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.