glcpp: Add test involving token pasting of INTEGER tokens.

[mesa.git] / src / glsl / main.cpp

diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 64c2496eba8802ab7868f178de3e35e3114a39f8..33cd79c8544fb12af1d801da434dabcccbbd8937 100644 (file)
--- 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) {
@@ -223,7 +223,7 @@ main(int argc, char **argv)
    if (argc <= optind)
       usage_fail(argv[0]);
 
-   initialize_context(ctx, (glsl_es) ? API_OPENGLES2 : API_OPENGL);
+   initialize_context(ctx, (glsl_es) ? API_OPENGLES2 : API_OPENGL_COMPAT);
 
    struct gl_shader_program *whole_program;