From 88b0790b1ae8864d4ec6196b3939498bbffdbb5f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 14 Sep 2012 10:13:01 +1000 Subject: 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 Signed-off-by: Dave Airlie --- src/glsl/test_optpass.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glsl/test_optpass.cpp') 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) { -- cgit v1.1