diff options
| author | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
| commit | 64e57ed257c559ea31cf162c67a7ef61fdc562e4 (patch) | |
| tree | dee99970e9d1e6d892f21db31488470bc7929d18 /src/mesa/shader/program.h | |
| parent | dabd09f5a92e5497ac6ac9b4ba26f806ddb25206 (diff) | |
| parent | 4fab47b13c214dc79e0ae5d8001521029ce34231 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
Diffstat (limited to 'src/mesa/shader/program.h')
| -rw-r--r-- | src/mesa/shader/program.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/mesa/shader/program.h b/src/mesa/shader/program.h index f1a69a2c016..48fe06ab7f3 100644 --- a/src/mesa/shader/program.h +++ b/src/mesa/shader/program.h @@ -67,13 +67,13 @@ _mesa_find_line_column(const GLubyte *string, const GLubyte *pos, GLint *line, GLint *col); -extern struct gl_program * -_mesa_init_vertex_program(GLcontext *ctx, - struct gl_vertex_program *prog, +extern struct gl_program * +_mesa_init_vertex_program(GLcontext *ctx, + struct gl_vertex_program *prog, GLenum target, GLuint id); -extern struct gl_program * -_mesa_init_fragment_program(GLcontext *ctx, +extern struct gl_program * +_mesa_init_fragment_program(GLcontext *ctx, struct gl_fragment_program *prog, GLenum target, GLuint id); @@ -115,6 +115,9 @@ _mesa_clone_program(GLcontext *ctx, const struct gl_program *prog); extern GLboolean _mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count); +extern GLboolean +_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count); + extern struct gl_program * _mesa_combine_programs(GLcontext *ctx, const struct gl_program *progA, |