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_shader.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_shader.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_shader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index 02f789c5009..554e342e805 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -175,7 +175,7 @@ update_vp( struct st_context *st ) */ assert(st->ctx->VertexProgram._Current); stvp = st_vertex_program(st->ctx->VertexProgram._Current); - assert(stvp->Base.Base.Target == GL_VERTEX_PROGRAM_ARB); + assert(stvp->Base.Target == GL_VERTEX_PROGRAM_ARB); memset(&key, 0, sizeof key); key.st = st->has_shareable_shaders ? NULL : st; @@ -190,7 +190,7 @@ update_vp( struct st_context *st ) key.clamp_color = st->clamp_vert_color_in_shader && st->ctx->Light._ClampVertexColor && - (stvp->Base.Base.OutputsWritten & + (stvp->Base.OutputsWritten & (VARYING_SLOT_COL0 | VARYING_SLOT_COL1 | VARYING_SLOT_BFC0 | |