Kenneth Graunke
33eaa3e0b3
glcpp: Rename "errors" to "info_log."
...
Eventually, we'll want to be be able to print out warnings as well.
2010-06-21 12:38:39 -07:00
Kenneth Graunke
03ee33809f
glcpp: Don't include newlines as part of #version-passthrough.
...
Fixes glcpp/tests/064-version.c.
2010-06-21 12:31:04 -07:00
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.
2010-06-21 12:31:04 -07:00
Kenneth Graunke
8f32221638
glcpp: Fix line and column numbering.
...
Lines were off by one, and column numbering was completely daft.
2010-06-21 12:31:03 -07:00
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.
2010-06-21 12:31:03 -07:00
Kenneth Graunke
0774523d18
glcpp: Add line locations to "Unterminated #if" error message.
2010-06-21 12:31:03 -07:00
Kenneth Graunke
8a132aa08b
glcpp: Add line locations to various mismatched #if error messages.
2010-06-21 12:31:03 -07:00
Kenneth Graunke
dcdf62f1c6
glcpp: Add line locations to "reserved name" error messages.
2010-06-21 12:31:03 -07:00
Kenneth Graunke
ca9e5fce25
glcpp: Print locations in error messages where possible.
2010-06-21 12:31:03 -07:00
Kenneth Graunke
f1e6c069fa
glcpp: Introduce new glcpp_error function.
2010-06-21 12:31:02 -07:00
Kenneth Graunke
b78c9ddfbf
glcpp: Set locations on tokens.
2010-06-21 11:31:56 -07:00
Kenneth Graunke
db938103c7
glcpp: Set line locations in the lexer.
2010-06-21 11:31:56 -07:00
Kenneth Graunke
465e03ee07
glcpp: Add plumbing to support line locations.
2010-06-21 11:31:55 -07:00
Kenneth Graunke
f70f60739a
glcpp: Add %error-verbose.
2010-06-21 11:31:55 -07:00
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.
2010-06-21 11:31:55 -07:00
Kenneth Graunke
e0e429fca3
glcpp: Build a reentrant parser.
2010-06-21 11:31:55 -07:00
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.
2010-06-21 11:31:55 -07:00
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.
2010-06-21 11:31:55 -07:00
Kenneth Graunke
f82d673648
glcpp: Handle missing newline at EOF.
...
Fixes CorrectFuncOverload.vert.
2010-06-21 11:31:55 -07:00
Kenneth Graunke
739ba06680
glcpp: Complain about unrecognized directives.
2010-06-21 11:31:55 -07:00
Kenneth Graunke
3b73ea36c4
glcpp: Pass #version, #extension, and #pragma directives through unchanged.
...
Let the main compiler's lexer/parser handle them.
2010-06-21 11:31:55 -07:00
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.
2010-06-21 11:31:54 -07:00
Kenneth Graunke
2848c4c183
Complain and exit if the given shader file doesn't exist.
2010-06-21 11:27:33 -07:00
Kenneth Graunke
1b1f43e608
glcpp: Add support for lexing from a string.
...
The standalone binary still reads from stdin, however.
2010-06-21 11:25:50 -07:00
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.
2010-06-21 11:25:50 -07:00
Kenneth Graunke
0656f6b875
glcpp: Fix a case of == where = probably ought to be.
...
Caught by a GCC warning.
2010-06-21 11:25:50 -07:00
Kenneth Graunke
cbaab7093c
Add glcpp to the build.
2010-06-21 11:25:48 -07:00
Kenneth Graunke
254a485c33
Specify %option prefix="glcpp_" in the source code, not the Makefile.
2010-06-21 11:25:30 -07:00
Kenneth Graunke
6f510a49d2
Merge Carl's preprocessor into the glcpp subdirectory.
2010-06-21 11:22:11 -07:00
José Fonseca
197636814e
llvmpipe: s/lpfs/shader/
2010-06-21 14:11:15 +01:00
Marek Olšák
d82f625333
r300g: fix the KIL opcode for r3xx-r4xx (v4)
2010-06-21 04:07:11 +02:00
Marek Olšák
646e9c2fd7
r300g: fix assigning the texture cache region for 1 texture
2010-06-20 14:06:14 +02:00
Vinson Lee
7f6754af25
mapi: Add missing stdlib.h header for malloc declaration.
2010-06-20 01:03:00 -07:00
Vinson Lee
d05e848035
i965g: Fix setup of immediate types for gen4 disasm.
...
Caught by clang.
Follow-up to commit 070bbd4fcd .
2010-06-20 00:58:52 -07:00
Marek Olšák
e8f2adf8e3
r300g: manually assign texture cache regions
...
This should fix corrupted texturing on r3xx-r4xx.
2010-06-20 05:30:04 +02:00
Marek Olšák
c85e53bebf
r600g: handle DRM_API_HANDLE_TYPE_KMS in buffer_get_handle
2010-06-20 03:59:32 +02:00
Marek Olšák
e4fe18a620
r300g: cleanup buffer_{from, get}_handle
2010-06-20 03:59:32 +02:00
Marek Olšák
6e96cfa39a
r300g: cleanup includes
2010-06-20 03:59:31 +02:00
Marek Olšák
a916669468
r300g: texture alignment code cleanup + use special alignment for AA textures
2010-06-20 03:59:28 +02:00
Will Dyson
c674a7eb7f
Revert "Fix image_matches_texture_obj() MaxLevel check"
...
This reverts commit a9ee956511 .
It was based on a failure to understand how ther driver allocates
memory, and causes a regression with Celestia.
Set MaxLevel to dstLevel before allocating new mipmap level.
The radeon driver will fail to allocate space for a new level that
is outside of BaseLevel..MaxLevel. Set MaxLevel before allocating.
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
2010-06-19 22:09:24 +02:00
Kenneth Graunke
f3eb42d200
Print out the info log if compilation fails.
2010-06-19 11:44:22 -07:00
Kenneth Graunke
b2ba6fac09
Change error/warning functions to print to the info log.
2010-06-19 11:44:21 -07:00
Ian Romanick
ca97bd395f
Initialize the shader info log
...
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2010-06-19 11:36:15 -07:00
Kenneth Graunke
32cf482215
Make shader a talloc context.
2010-06-19 11:36:15 -07:00
Kenneth Graunke
57d0fc4139
Link against talloc. We're going to be using it.
2010-06-19 11:36:15 -07:00
Marek Olšák
9b2ebcaf4b
r300g: fix random pixels appearing / incomplete rendering
...
This should fix the FDO bug #28612 .
Also, these piglit tests have been fixed:
- fbo-copypix
- scissor-copypixels
- copytexsubimage
- texredefine
Finally, 2 flushes in the transfer path are no longer needed.
2010-06-19 20:26:16 +02:00
Marek Olšák
4c76184305
r300g: output floats instead of halfs when passed through translate
2010-06-19 17:20:40 +02:00
Kenneth Graunke
c186b3fbe0
Fix crash when running glsl on a signle fragment shader.
2010-06-19 01:29:17 -07:00
Kenneth Graunke
29e6087481
Rename prog to shader. Less confusing.
2010-06-19 01:29:17 -07:00
Kenneth Graunke
520aad2c3e
Fix compile on 64-bit.
2010-06-19 01:29:17 -07:00