From 81faead818a0b2fde131df019f5dfb0baef49273 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 19 Oct 2016 12:30:09 +1100 Subject: 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 --- src/mesa/tnl/t_vp_build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/tnl/t_vp_build.c') diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c index 4728c7043bd..18d105f5fd0 100644 --- a/src/mesa/tnl/t_vp_build.c +++ b/src/mesa/tnl/t_vp_build.c @@ -40,7 +40,7 @@ */ void _tnl_UpdateFixedFunctionProgram( struct gl_context *ctx ) { - const struct gl_vertex_program *prev = ctx->VertexProgram._Current; + const struct gl_program *prev = ctx->VertexProgram._Current; if (!ctx->VertexProgram._Current || ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram) { @@ -54,6 +54,6 @@ void _tnl_UpdateFixedFunctionProgram( struct gl_context *ctx ) */ if (ctx->VertexProgram._Current != prev && ctx->Driver.BindProgram) { ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB, - (struct gl_program *) ctx->VertexProgram._Current); + ctx->VertexProgram._Current); } } -- cgit v1.2.3