summaryrefslogtreecommitdiff
path: root/src/glsl/glcpp
AgeCommit message (Collapse)Author
2011-03-04glsl/glcpp: Use stdio.h instead of unistd.h.José Fonseca
2011-03-04glsl: Define YY_NO_UNISTD_H on MSVC.José Fonseca
2011-03-03glcpp: Remove trailing contexts from #if rules.Kenneth Graunke
These are now unnecessary.
2011-03-03glcpp: Rework lexer to use a SKIP state rather than REJECT.Kenneth Graunke
Previously, the rule deleted by this commit was matched every single time (being the longest match). If not skipping, it used REJECT to continue on to the actual correct rule. The flex manual advises against using REJECT where possible, as it is one of the most expensive lexer features. So using it on every match seems undesirable. Perhaps more importantly, it made it necessary for the #if directive rules to contain a look-ahead pattern to make them as long as the (now deleted) "skip the whole line" rule. This patch introduces an exclusive start state, SKIP, to avoid REJECTs. Each time the lexer is called, the code at the top of the rules section will run, implicitly switching the state to the correct one. Fixes piglit tests 16384-consecutive-chars.frag and 16385-consecutive-chars.frag.
2011-03-03glcpp/tests: Update 063-comments.c.expected to match output.Kenneth Graunke
The expected result has been out of sync with what glcpp produces for some time; glcpp's actual result seems to be correct and is very close to GCC's cpp. Updating this will make it easier to catch regressions in upcoming commits.
2011-03-02glsl: Remove unused glcpp/Makefile.am.Kenneth Graunke
This is a remnant of when glsl2 lived in its own repository.
2011-03-01Add generated parser / lexer files to gitignore listsIan Romanick
2011-03-01glcpp: Remove files generated by flex and bison from GITIan Romanick
2011-02-11glcpp: regerated filesIan Romanick
These should have been committed right after fd1252ab, but they were missed. Soon, we'll never have to do this again...
2011-02-02glcpp: Raise error when modulus is zeroChad Versace
For example, this now raises an error: #define XXX 1 / 0 Fixes bug: https://bugs.freedesktop.org//show_bug.cgi?id=33507 Fixes Piglit test: spec/glsl-1.10/preprocessor/modulus-by-zero.vert NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-01-31glsl: regerated filesBrian Paul
2011-01-31glsl: make _token_list_is_empty_ignoring_space() staticBrian Paul
To silence warning about missing prototype.
2011-01-31Convert everything from the talloc API to the ralloc API.Kenneth Graunke
2011-01-29Revert "glcpp: Demote "macro redefined" from an error to a warning"Carl Worth
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).
2011-01-28glcpp: Demote "macro redefined" from an error to a warningCarl Worth
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.
2011-01-26glsl: Refresh autogenerated parser filesChad Versace
For commits titled: glcpp: Conditionally define macro GL_AMD_conservative_depth glsl: Add support for AMD_conservative_depth to parser
2011-01-26glcpp: Conditionally define macro GL_AMD_conservative_depthChad Versace
Define macro GL_AMD_conservative_depth to 1 when its extension is enabled.
2011-01-21glcpp: Regenerate parser files.Kenneth Graunke
2011-01-21glcpp: Remove use of talloc reference counting.Kenneth Graunke
We almost always want to simply steal; we only need to copy when copying a token list (in which case we're already cloning stuff anyway).
2011-01-10glcpp: Refresh autogenerated lexer and parser files.Ian Romanick
For the previous commit.
2011-01-10glcpp: Generate an error for division by zeroIan Romanick
When GCC encounters a division by zero in a preprocessor directive, it generates an error. Since the GLSL spec says that the GLSL preprocessor behaves like the C preprocessor, we should generate that same error. It's worth noting that I cannot find any text in the C99 spec that says this should be an error. The only text that I can find is line 5 on page 82 (section 6.5.5 Multiplicative Opertors), which says, "The result of the / operator is the quotient from the division of the first operand by the second; the result of the % operator is the remainder. In both operations, if the value of the second operand is zero, the behavior is undefined." Fixes 093-divide-by-zero.c test and bugzilla #32831. NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-01-10glcpp: Regenerate glcpp-parse.cChad Versace
2011-01-10glcpp: Fix segfault when validating macro redefinitionsChad Versace
In _token_list_equal_ignoring_space(token_list_t*, token_list_t*), add a guard that prevents dereferncing a null token list. This fixes test src/glsl/glcpp/tests/092-redefine-macro-error-2.c and Bugzilla #32695.
2011-01-04glcpp: Add test for recursive #define.Vinson Lee
2011-01-04glcpp: Add division by zero test cases.Vinson Lee
2010-12-27glcpp: Add negative tests for redefintions with valueless macros.Vinson Lee
2010-12-07Refresh autogenerated glcpp parser.Kenneth Graunke
2010-12-07glcpp: Don't emit SPACE tokens in conditional_tokens production.Kenneth Graunke
Fixes glslparsertest defined-01.vert. Reported-by: José Fonseca <jfonseca@vmware.com> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2010-11-17Regenerate glcpp parser.Kenneth Graunke
2010-11-17glsl: Unconditionally define GL_FRAGMENT_PRECISION_HIGH in ES2 shaders.Kenneth Graunke
This is really supposed to be defined only if the driver supports highp in the fragment shader - but all of our current ES2 implementations do. So, just define it. In the future, we'll need to add a flag to gl_context and only define the macro if the flag is set. "Fixes" freedesktop.org bug #31673.
2010-11-16Refresh autogenerated glcpp parser.Kenneth Graunke
2010-11-16glcpp: Define GL_FRAGMENT_PRECISION_HIGH if GLSL version >= 1.30.Kenneth Graunke
Per section 4.5.4 of the GLSL 1.30 specification.
2010-11-08r600g: implement texture_get_handle (needed for eglExportDRMImageMESA)Benjamin Franzke
2010-10-21glcpp: Refresh autogenerated lexer file.Kenneth Graunke
2010-10-21glcpp: Return NEWLINE token for newlines inside multi-line comments.Kenneth Graunke
This is necessary for the main compiler to get correct line numbers.
2010-10-14glsl: Slightly change the semantic of _LinkedShadersIan Romanick
Previously _LinkedShaders was a compact array of the linked shaders for each shader stage. Now it is arranged such that each slot, indexed by the MESA_SHADER_* defines, refers to a specific shader stage. As a result, some slots will be NULL. This makes things a little more complex in the linker, but it simplifies things in other places. As a side effect _NumLinkedShaders is removed. NOTE: This may be a candidate for the 7.9 branch. If there are other patches that get backported to 7.9 that use _LinkedShader, this patch should be cherry picked also.
2010-10-08glcpp: Regenerate files changes by previous commitIan Romanick
2010-10-08glcpp: Add the define for ARB_explicit_attrib_location when presentIan Romanick
2010-09-07glcpp: Fix build on non-GCC compilers.Kenneth Graunke
2010-09-07glsl: Define GL_ES preprocessor macro if API is OpenGL ES 2.0.Kenneth Graunke
Also define it if #version 100 is encountered.
2010-08-27glsl2: remove 'extern' keyword in .c fileBrian Paul
2010-08-25glsl/mesa: fixes for MSVCAras Pranckevicius
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-08-24glsl: Include main/core.h.Chia-I Wu
Make glsl include only main/core.h from core mesa.
2010-08-23glcpp: Make standalone preprocessor work with a tty as stdinCarl Worth
Previously glcpp would silently abort if it couldn't fstat the file being read, (so it would work with stdin redirected from a file, but would not work with stdin as a tty). The stat was so that glcpp could allocate a buffer for the file content in a single call. We now use talloc_realloc instead, (even if the fstat is possible). This is theoretically less efficient, but quite irrelevant, (particularly because the standalone preprocessor is used only for testing).
2010-08-23glcpp: Fix test suite to avoid flagging failed tests as valgrind errors.Carl Worth
We recently added several tests that intentionally trigger preprocessor errors. During valgrind-based testing, our test script was noticing the non-zero return value from the preprocessor and incorrectly flagging the valgrind-based test as failing. To fix this, we make valgrind return an error code that is otherwise unused by the preprocessor.
2010-08-23glcpp: Fix segfault in standalone preprocessor for "file not found", etc.Carl Worth
This error message was missing so that the program would simply segfault if the provided filename could not be opened for some reason. While we're at it, we add explicit support for a filename of "-" to indicate input from stdin.
2010-08-23glcpp: Update generated glcpp-lex.c for the last two changes.Carl Worth
This fixes both "#line 0" and "#line XXX YYY" as described in the two most recent commits.
2010-08-23glcpp: Fix handling of "#line 0"Carl Worth
The existing DECIMAL_INTEGER pattern is the correct thing to use when looking for a C decimal integer, (that is, a digit-sequence not starting with 0 which would instead be an octal integer). But for #line, we really want to accept any digit sequence, (including "0"), and always interpret it as a decimal constant. So we add a new DIGITS pattern for this case. This should fix the compilation failure noted in bug #28138 https://bugs.freedesktop.org/show_bug.cgi?id=28138 (Though the generated file will not be updated until the next commit.)
2010-08-23glcpp: Fix source numbers set with "#line LINE_NUMBER SOURCE_NUMBER"Carl Worth
Previously, the YY_USER_ACTION was overwriting the yylloc->source value in every action, (after that value had been carefully set by the handling of the #line directive). Instead, we want to initialize it once in YY_USER_INIT and then not touch it at all in YY_USER_ACTION.
2010-08-23glcpp: Add new test for #line directive.Carl Worth
This test exposes two current bugs: 1. The source number is not being correctly emitted in error messages (instead, it's always 0). 2. A directive of "#line 0" is resulting in the following parse error: preprocessor error: Invalid tokens after #