diff options
| author | Eric Anholt <[email protected]> | 2013-06-12 15:49:43 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-06-21 10:04:30 -0700 |
| commit | 0343f20e2f8cc8a588effb028c4043ed2a4744c0 (patch) | |
| tree | c36344509a10a034896ac6ebb6430f42a430b541 /src/glsl/program.h | |
| parent | 10c14d16d28c5e868b042e575aaaa922604e5e7e (diff) | |
mesa: Move the common _mesa_glsl_compile_shader() code to glsl/.
This code had no relation to ir_to_mesa.cpp, since it was also used by
intel and state_tracker, and most of it was duplicated with the standalone
compiler (which has periodically drifted from the Mesa copy).
v2: Split from the ir_to_mesa to shaderapi.c changes.
Acked-by: Paul Berry <[email protected]> (v1)
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl/program.h')
| -rw-r--r-- | src/glsl/program.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/glsl/program.h b/src/glsl/program.h index 6a76d4d5494..f15113a08d2 100644 --- a/src/glsl/program.h +++ b/src/glsl/program.h @@ -24,15 +24,27 @@ #include "main/core.h" +#ifdef __cplusplus +extern "C" { +#endif + +extern void +_mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader, + bool dump_ast, bool dump_hir); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + extern void link_shaders(struct gl_context *ctx, struct gl_shader_program *prog); extern void -linker_error(gl_shader_program *prog, const char *fmt, ...) +linker_error(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3); extern void -linker_warning(gl_shader_program *prog, const char *fmt, ...) +linker_warning(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3); extern long |