diff options
| author | Timothy Arceri <[email protected]> | 2016-10-19 13:23:37 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 3423488d55b9c483fcdb3996eb89b424c1031d24 (patch) | |
| tree | 270d90fe3fd4c090f2c8e59a3b20d0afe7d98e72 /src/mesa/program/arbprogparse.h | |
| parent | 17e28a1571b6141368fefc84cc8b0a3b4e52f8ee (diff) | |
st/mesa/r200/i915/i965: eliminate gl_fragment_program
Here we move OriginUpperLeft and PixelCenterInteger into gl_program
all other fields have been replace by shader_info.
V2: Don't use anonymous union/structs to hold vertex/fragment fields
suggested by Ian.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/program/arbprogparse.h')
| -rw-r--r-- | src/mesa/program/arbprogparse.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/program/arbprogparse.h b/src/mesa/program/arbprogparse.h index 05d93f0370b..1c39a451d07 100644 --- a/src/mesa/program/arbprogparse.h +++ b/src/mesa/program/arbprogparse.h @@ -29,8 +29,7 @@ #include "main/glheader.h" struct gl_context; -struct gl_fragment_program; -struct gl_vertex_program; +struct gl_program; extern void _mesa_parse_arb_vertex_program(struct gl_context *ctx, GLenum target, @@ -40,6 +39,6 @@ _mesa_parse_arb_vertex_program(struct gl_context *ctx, GLenum target, extern void _mesa_parse_arb_fragment_program(struct gl_context *ctx, GLenum target, const GLvoid *str, GLsizei len, - struct gl_fragment_program *program); + struct gl_program *program); #endif |