Eric Anholt
e46a454305
ir: Give ir_instruction a print visitor helper.
This avoids spamming each file with includes of ir_print_visitor.h
because someone was doing debugging at some point, and is less typing
when doing debugging.
15 anni fa
Eric Anholt
216580dbd7
Hook up texturing in the hierarchical visitor.
15 anni fa
Eric Anholt
ac95f2f8c8
Include stdio.h and stdlib.h everywhere, and don't cook our own #define NULL.
15 anni fa
Ian Romanick
b302359394
Add missing build products to gitignore
15 anni fa
Kenneth Graunke
1b85c46bcf
glcpp: Initialize error state.
15 anni fa
Kenneth Graunke
332fc47dc0
glcpp: Accept #elif without an expression if the expression doesn't matter.
Issue a warning. nVidia's compiler seems to accept this; apparently
GCC < 4.4 did as well: http://gcc.gnu.org/gcc-4.4/porting_to.html
15 anni fa
Kenneth Graunke
74704e80c6
glcpp: Print to the main compiler's infolog, not stdout.
15 anni fa
Kenneth Graunke
4a2bbdacfc
Use yy_scan_string and stop caring about shader->SourceLen.
We had to call strlen on the preprocessed source, which seemed a bit
pointless; also, we updated shader->SourceLen but not shader->Source,
which was even more confusing. Just leave both untouched.
15 anni fa
Kenneth Graunke
26e761edb2
glcpp: Rework handling of "defined" operator.
It's now done in the grammar, and as a result, can easily handle
parenthesis. defined ( identifier ) is now supported.
Fixes glcpp/tests/065-if-defined-parens.c.
15 anni fa
Kenneth Graunke
bac0e371e3
glcpp/tests: Add a test for #if defined (identifier)
Previously we only tested #if defined identifier (without parenthesis).
15 anni fa
Kenneth Graunke
6587574354
glcpp: Ignore junk tokens at end of #ifdef/#ifndef (with warning)
Both nVidia's compiler and GCC accept this.
Fixes CorrectPreprocess11.frag.
15 anni fa
Kenneth Graunke
c9529c4d77
glcpp: Add glcpp_warning for printing warnings to the info log.
15 anni fa
Kenneth Graunke
62b4b7785a
glcpp: Add boolean 'error' flag.
We used to check if the info log is non-empty, but when we print
warnings, this will no longer be valid.
15 anni fa
Kenneth Graunke
33eaa3e0b3
glcpp: Rename "errors" to "info_log."
Eventually, we'll want to be be able to print out warnings as well.
15 anni fa
Kenneth Graunke
03ee33809f
glcpp: Don't include newlines as part of #version-passthrough.
Fixes glcpp/tests/064-version.c.
15 anni fa
Kenneth Graunke
214632f527
glcpp/tests: Add a test for #version followed by #define.
This isn't really a C file, but...that's probably okay.
15 anni fa
Kenneth Graunke
8f32221638
glcpp: Fix line and column numbering.
Lines were off by one, and column numbering was completely daft.
15 anni fa
Kenneth Graunke
e8e93a4543
glcpp: Remove calls to exit().
Calling exit() would be really bad once integrated into mesa. Even in
the standalone binary, we want to print the error log first.
Since each case already flags an error, compilation will still fail,
but it may go on (with something fudged) and generate more errors.
15 anni fa
Kenneth Graunke
0774523d18
glcpp: Add line locations to "Unterminated #if" error message.
15 anni fa
Kenneth Graunke
8a132aa08b
glcpp: Add line locations to various mismatched #if error messages.
15 anni fa
Kenneth Graunke
dcdf62f1c6
glcpp: Add line locations to "reserved name" error messages.
15 anni fa
Kenneth Graunke
ca9e5fce25
glcpp: Print locations in error messages where possible.
15 anni fa
Kenneth Graunke
f1e6c069fa
glcpp: Introduce new glcpp_error function.
15 anni fa
Kenneth Graunke
b78c9ddfbf
glcpp: Set locations on tokens.
15 anni fa
Kenneth Graunke
db938103c7
glcpp: Set line locations in the lexer.
15 anni fa
Kenneth Graunke
465e03ee07
glcpp: Add plumbing to support line locations.
15 anni fa
Kenneth Graunke
f70f60739a
glcpp: Add %error-verbose.
15 anni fa
Kenneth Graunke
77260fc0a0
glcpp: Actually support #ifdef and #ifndef.
Strangely, the lexer never created these tokens, even though the parser
already had code to handle them.
15 anni fa
Kenneth Graunke
e0e429fca3
glcpp: Build a reentrant parser.
15 anni fa
Kenneth Graunke
b673ff91ab
glcpp: Print errors on stdout instead of stderr (non-standalone version).
Otherwise, piglit marks tests as "warn" when the shader was (correctly)
failing.
15 anni fa
Kenneth Graunke
3370c5f90b
glcpp/tests: Add extra newline at the end of expected output.
This newline at EOF is harmless and generated by the previous commit.
15 anni fa
Kenneth Graunke
f82d673648
glcpp: Handle missing newline at EOF.
Fixes CorrectFuncOverload.vert.
15 anni fa
Kenneth Graunke
739ba06680
glcpp: Complain about unrecognized directives.
15 anni fa
Kenneth Graunke
3b73ea36c4
glcpp: Pass #version, #extension, and #pragma directives through unchanged.
Let the main compiler's lexer/parser handle them.
15 anni fa
Kenneth Graunke
04ba86a536
Make the main compiler call the preprocessor.
By using a single function, the main compiler doesn't need to include
glcpp.h, which currently has a lot of details about the preprocessor
internals. In particular, this prevents the two yacc grammars from
seeing each other, which would be rather messy to sort out.
15 anni fa
Kenneth Graunke
2848c4c183
Complain and exit if the given shader file doesn't exist.
15 anni fa
Kenneth Graunke
1b1f43e608
glcpp: Add support for lexing from a string.
The standalone binary still reads from stdin, however.
15 anni fa
Kenneth Graunke
4c8a1af811
glcpp: Output to a buffer and error log rather than directly printing.
In the standalone case, simply print the buffers when done.
15 anni fa
Kenneth Graunke
0656f6b875
glcpp: Fix a case of == where = probably ought to be.
Caught by a GCC warning.
15 anni fa
Kenneth Graunke
cbaab7093c
Add glcpp to the build.
15 anni fa
Kenneth Graunke
254a485c33
Specify %option prefix="glcpp_" in the source code, not the Makefile.
15 anni fa
Kenneth Graunke
6f510a49d2
Merge Carl's preprocessor into the glcpp subdirectory.
15 anni fa
Kenneth Graunke
f3eb42d200
Print out the info log if compilation fails.
15 anni fa
Kenneth Graunke
b2ba6fac09
Change error/warning functions to print to the info log.
15 anni fa
Ian Romanick
ca97bd395f
Initialize the shader info log
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
15 anni fa
Kenneth Graunke
32cf482215
Make shader a talloc context.
15 anni fa
Kenneth Graunke
57d0fc4139
Link against talloc. We're going to be using it.
15 anni fa
Kenneth Graunke
c186b3fbe0
Fix crash when running glsl on a signle fragment shader.
15 anni fa
Kenneth Graunke
29e6087481
Rename prog to shader. Less confusing.
15 anni fa
Kenneth Graunke
520aad2c3e
Fix compile on 64-bit.
15 anni fa