summaryrefslogtreecommitdiffstats
path: root/src/glsl/glcpp/glcpp-parse.c
Commit message (Collapse)AuthorAgeFilesLines
* glcpp: regerated filesIan Romanick2011-02-111-177/+190
| | | | | These should have been committed right after fd1252ab, but they were missed. Soon, we'll never have to do this again...
* glsl: regerated filesBrian Paul2011-01-311-122/+114
|
* Convert everything from the talloc API to the ralloc API.Kenneth Graunke2011-01-311-182/+183
|
* Revert "glcpp: Demote "macro redefined" from an error to a warning"Carl Worth2011-01-291-4/+4
| | | | | | | | This reverts commit d3df641f0aba99b0b65ecd4d9b06798bca090a29. The original commit had sat unpushed on my machine for months. By the time I found it again, I had forgotten that we had decided not to use this change after all, (the relevant test was removed long ago).
* glcpp: Demote "macro redefined" from an error to a warningCarl Worth2011-01-281-4/+4
| | | | | | | | | | The GLSL specification is vague here, (just says "as is standard for C++"), though the C specifications seem quite clear that this should be an error. However, an existing piglit test (CorrectPreprocess11.frag) expects this to be a warning, not an error, so we change this, and document in README the deviation from the specification.
* glsl: Refresh autogenerated parser filesChad Versace2011-01-261-0/+2
| | | | | | For commits titled: glcpp: Conditionally define macro GL_AMD_conservative_depth glsl: Add support for AMD_conservative_depth to parser
* glcpp: Regenerate parser files.Kenneth Graunke2011-01-211-229/+231
|
* glcpp: Refresh autogenerated lexer and parser files.Ian Romanick2011-01-101-184/+181
| | | | For the previous commit.
* glcpp: Regenerate glcpp-parse.cChad Versace2011-01-101-0/+21
|
* Refresh autogenerated glcpp parser.Kenneth Graunke2010-12-071-47/+46
|
* Regenerate glcpp parser.Kenneth Graunke2010-11-171-85/+90
|
* Refresh autogenerated glcpp parser.Kenneth Graunke2010-11-161-196/+207
|
* glcpp: Regenerate files changes by previous commitIan Romanick2010-10-081-121/+116
|
* glcpp: Fix build on non-GCC compilers.Kenneth Graunke2010-09-071-87/+88
|
* glsl: Define GL_ES preprocessor macro if API is OpenGL ES 2.0.Kenneth Graunke2010-09-071-215/+230
| | | | Also define it if #version 100 is encountered.
* glsl: Include main/core.h.Chia-I Wu2010-08-241-1/+1
| | | | Make glsl include only main/core.h from core mesa.
* glcpp: Refresh generated files.Carl Worth2010-08-171-226/+339
| | | | After a recent change to glcpp-parse.y (adding "redefined macro" error).
* glcpp: Refresh autogenerated lexer and parser.Kenneth Graunke2010-08-161-1/+1
|
* Revert "glsl2: Use stdint.h instead of inttypes.h"José Fonseca2010-08-141-1/+1
| | | | This reverts commit a77a6bc008b3146c56431fa520a00e1f8dfa3938.
* glsl2: Refresh autogenerated bison parser.Kenneth Graunke2010-08-131-114/+122
|
* glsl2: Use stdint.h instead of inttypes.hIan Romanick2010-08-131-1/+1
|
* glsl2: Add missing include of string.hIan Romanick2010-08-121-107/+108
| | | | Makes the build happy on non-GCC platforms.
* glcpp: Fix "unterminated if" diagnostic.Carl Worth2010-08-111-2/+0
| | | | | | | | | | | 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: Reword diagnostic for #elif with no expressionCarl Worth2010-08-111-1/+1
| | | | | | 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: Regenerate glcpp-parse.cCarl Worth2010-08-111-111/+133
| | | | After a recent change to glcpp-parse.y
* glcpp: Regnerate glcpp-parse.c and glcpp-parse.hCarl Worth2010-08-101-212/+220
| | | | After making a minor change to the .y file.
* glcpp: Ignore #if and #elif expressions when skipping.Kenneth Graunke2010-08-041-94/+108
| | | | | Fixes glcpp test cases 073 and 074, as well as piglit test xonotic-vs-generic-diffuse.vert.
* glcpp: Refactor HASH_IF and HASH_ELIF expansion to reuse code.Kenneth Graunke2010-08-041-124/+123
|
* glcpp: Refresh autogenerated lexer and parser.Kenneth Graunke2010-08-041-122/+130
|
* glsl2: Actually fix glsl-version-define.Eric Anholt2010-07-281-3/+0
|
* glcpp: Add __VERSION__ define to the current language version.Eric Anholt2010-07-281-475/+493
| | | | | | | Fixes: glsl-version-define glsl-version-define-110 glsl-version-define-120
* glcpp: Print integer tokens as decimal, not hex.Eric Anholt2010-07-281-1/+1
|
* glsl2: Add the define for ARB_fragment_coord_conventions when present.Eric Anholt2010-07-281-0/+8
| | | | | Fixes: glsl-arb-fragment-coord-conventions-define
* glcpp: Add generated source files.Carl Worth2010-07-281-0/+3957
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).