diff options
| author | Dave Airlie <[email protected]> | 2012-09-14 10:13:01 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2012-09-15 08:22:55 +1000 |
| commit | 88b0790b1ae8864d4ec6196b3939498bbffdbb5f (patch) | |
| tree | 4de2b64235ad51a222889298fa7dcd1d1d3994c0 /src/glsl/main.cpp | |
| parent | 53d46bc787318ccf9911fdd1d5fe99ee4db7f41a (diff) | |
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 <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/glsl/main.cpp')
| -rw-r--r-- | src/glsl/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp index 64c2496eba8..04143ad4373 100644 --- a/src/glsl/main.cpp +++ b/src/glsl/main.cpp @@ -144,7 +144,7 @@ compile_shader(struct gl_context *ctx, struct gl_shader *shader) new(shader) _mesa_glsl_parse_state(ctx, shader->Type, shader); 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) { |