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 <jason@jlekstrand.net>
This commit is contained in:
@@ -70,8 +70,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
|
||||
shared->Programs = _mesa_NewHashTable();
|
||||
|
||||
shared->DefaultVertexProgram =
|
||||
gl_vertex_program(ctx->Driver.NewProgram(ctx,
|
||||
GL_VERTEX_PROGRAM_ARB, 0));
|
||||
ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
|
||||
shared->DefaultFragmentProgram =
|
||||
gl_fragment_program(ctx->Driver.NewProgram(ctx,
|
||||
GL_FRAGMENT_PROGRAM_ARB, 0));
|
||||
@@ -332,7 +331,7 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)
|
||||
_mesa_HashDeleteAll(shared->Programs, delete_program_cb, ctx);
|
||||
_mesa_DeleteHashTable(shared->Programs);
|
||||
|
||||
_mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL);
|
||||
_mesa_reference_program(ctx, &shared->DefaultVertexProgram, NULL);
|
||||
_mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL);
|
||||
|
||||
_mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx);
|
||||
|
Reference in New Issue
Block a user