diff options
| author | Timothy Arceri <[email protected]> | 2016-10-19 12:30:09 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 81faead818a0b2fde131df019f5dfb0baef49273 (patch) | |
| tree | 66610c70a8ed5a963ce927729e8a56115142783d /src/mesa/state_tracker/st_atom.c | |
| parent | 0ab51f8e164b33c5e3bc6836d0574080ef9d1dd8 (diff) | |
mesa/i965/i915/r200: eliminate gl_vertex_program
Here we move the only field in gl_vertex_program to the
ARB program fields in gl_program.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_atom.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c index dc4e1432eab..573615e2ea0 100644 --- a/src/mesa/state_tracker/st_atom.c +++ b/src/mesa/state_tracker/st_atom.c @@ -69,7 +69,7 @@ static void check_program_state( struct st_context *st ) struct st_geometry_program *old_gp = st->gp; struct st_fragment_program *old_fp = st->fp; - struct gl_vertex_program *new_vp = ctx->VertexProgram._Current; + struct gl_program *new_vp = ctx->VertexProgram._Current; struct gl_program *new_tcp = ctx->TessCtrlProgram._Current; struct gl_program *new_tep = ctx->TessEvalProgram._Current; struct gl_program *new_gp = ctx->GeometryProgram._Current; @@ -122,7 +122,7 @@ static void check_attrib_edgeflag(struct st_context *st) { const struct gl_client_array **arrays = st->ctx->Array._DrawArrays; GLboolean vertdata_edgeflags, edgeflag_culls_prims, edgeflags_enabled; - struct gl_vertex_program *vp = st->ctx->VertexProgram._Current; + struct gl_program *vp = st->ctx->VertexProgram._Current; if (!arrays) return; |