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/drivers/common/meta.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/drivers/common/meta.c')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 890e98a06b6..6020507cbda 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -566,8 +566,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) if (ctx->Extensions.ARB_vertex_program) { save->VertexProgramEnabled = ctx->VertexProgram.Enabled; - _mesa_reference_vertprog(ctx, &save->VertexProgram, - ctx->VertexProgram.Current); + _mesa_reference_program(ctx, &save->VertexProgram, + ctx->VertexProgram.Current); _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, GL_FALSE); } @@ -945,9 +945,9 @@ _mesa_meta_end(struct gl_context *ctx) if (ctx->Extensions.ARB_vertex_program) { _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, save->VertexProgramEnabled); - _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, - save->VertexProgram); - _mesa_reference_vertprog(ctx, &save->VertexProgram, NULL); + _mesa_reference_program(ctx, &ctx->VertexProgram.Current, + save->VertexProgram); + _mesa_reference_program(ctx, &save->VertexProgram, NULL); } if (ctx->Extensions.ARB_fragment_program) { |