diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-09-14 10:13:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-09-15 08:22:55 +1000 |
| commit | 88b0790b1ae8864d4ec6196b3939498bbffdbb5f (patch) | |
| tree | 4de2b64235ad51a222889298fa7dcd1d1d3994c0 /src/glsl/test_optpass.cpp | |
| parent | 53d46bc787318ccf9911fdd1d5fe99ee4db7f41a (diff) | |
| download | external_mesa3d-88b0790b1ae8864d4ec6196b3939498bbffdbb5f.zip external_mesa3d-88b0790b1ae8864d4ec6196b3939498bbffdbb5f.tar.gz external_mesa3d-88b0790b1ae8864d4ec6196b3939498bbffdbb5f.tar.bz2 | |
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>
Diffstat (limited to 'src/glsl/test_optpass.cpp')
| -rw-r--r-- | src/glsl/test_optpass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/test_optpass.cpp b/src/glsl/test_optpass.cpp index 31f65c3..5ed1170 100644 --- a/src/glsl/test_optpass.cpp +++ b/src/glsl/test_optpass.cpp @@ -216,7 +216,7 @@ int test_optpass(int argc, char **argv) } else { shader->Source = input.c_str(); const char *source = shader->Source; - state->error = preprocess(state, &source, &state->info_log, + state->error = glcpp_preprocess(state, &source, &state->info_log, state->extensions, ctx->API) != 0; if (!state->error) { |