| 7cfd42cefe1949af51ecced9891f415eca2c0e66 |
|
14-Sep-2012 |
Dave Airlie <airlied@redhat.com> |
mesa/glsl: rename preprocess to glcpp_preprocess
This symbol with dricore escapes into the namespace, its too generic,
we should prefix it with something just to be nice.
Should be applied to stable + 9.0
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 88b0790b1ae8864d4ec6196b3939498bbffdbb5f)
/external/mesa3d/src/glsl/glcpp/pp.c
|
| 1db463ce2e2812c4e41ab4096ff16a148d4bcc90 |
|
09-Jun-2012 |
Carl Worth <cworth@cworth.org> |
glsl: Consistently use length-based ralloc string functions for info_log.
Commit b823b99ec0f13af257dcd885f436a4d294c6222a switched from using
functions such as ralloc_asprintf and ralloc_strcat to
ralloc_asprintf_rewrite_tail. This change maintains the string's
length as a aparamter that is updated by the ralloc functions (rather
than recomputing it with strlen over and over).
However, the change failed to updated two locations (glcpp_error and
glcpp_warning), with the result that the string's length wasn't
updated by these calls. Then, subsequent calls to other
ralloc_asprintf_rewrite_tail would overwrite the text appended by
glcpp_error.
This commit fixes the two missing updates, and restores line numbers
to the output of glcpp error messages, (as noticed by a glcpp unit
test case that has been failing since the above-mentioned commit).
Signed-off-by: Carl Worth <cworth@cworth.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/glsl/glcpp/pp.c
|
| d3073f58c17d8675a2ecdd5dfa83e5520c78e1a8 |
|
21-Jan-2011 |
Kenneth Graunke <kenneth@whitecape.org> |
Convert everything from the talloc API to the ralloc API.
/external/mesa3d/src/glsl/glcpp/pp.c
|
| 7dcfc44b72f00ba5a38cb02123c80113440f0de9 |
|
05-Sep-2010 |
Kenneth Graunke <kenneth@whitecape.org> |
glsl: Define GL_ES preprocessor macro if API is OpenGL ES 2.0.
Also define it if #version 100 is encountered.
/external/mesa3d/src/glsl/glcpp/pp.c
|
| 1be5d1c887b3308865c8f4770138a9d70251392f |
|
27-Aug-2010 |
Brian Paul <brianp@vmware.com> |
glsl2: remove 'extern' keyword in .c file
/external/mesa3d/src/glsl/glcpp/pp.c
|
| 653ddaab2636764b9e7999fa39b37edde7fe7c6d |
|
25-Aug-2010 |
Aras Pranckevicius <aras@unity3d.com> |
glsl/mesa: fixes for MSVC
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/glsl/glcpp/pp.c
|
| 204d4cbea0de81f6f162ae0348e476de6c916ca8 |
|
13-Aug-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
glsl2: Include string.h in preprocessor
/external/mesa3d/src/glsl/glcpp/pp.c
|
| da6b10a7eb26c8a13056cbae9015d5b84f134142 |
|
11-Aug-2010 |
Carl Worth <cworth@cworth.org> |
glcpp: Fix "unterminated if" diagnostic.
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.
/external/mesa3d/src/glsl/glcpp/pp.c
|
| d1dda951c85f65612ed6fe080728f67fdc93d232 |
|
11-Aug-2010 |
Brian Paul <brianp@vmware.com> |
glsl2: move declarations before code
/external/mesa3d/src/glsl/glcpp/pp.c
|
| 805cbf39224580fdb85b09a21be7cbc658f0ecf6 |
|
30-Jul-2010 |
Kenneth Graunke <kenneth@whitecape.org> |
glcpp: Don't look for backslashes before the beginning of the string.
Fixes a valgrind error.
/external/mesa3d/src/glsl/glcpp/pp.c
|
| 06143ea09411aa283ac3633bfbfa4326584cd952 |
|
01-Jul-2010 |
Ian Romanick <ian.d.romanick@intel.com> |
glsl2: Conditionally define preprocessor tokens for optional extensions
The only optional extension currently supported by the compiler is
GL_EXT_texture_array.
/external/mesa3d/src/glsl/glcpp/pp.c
|
| 29285882676388aacff123e8bdf025904abf8ea9 |
|
25-Jun-2010 |
Eric Anholt <eric@anholt.net> |
glsl2: Move the compiler to the subdirectory it will live in in Mesa.
/external/mesa3d/src/glsl/glcpp/pp.c
|