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/main/shared.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/main/shared.c')
| -rw-r--r-- | src/mesa/main/shared.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index 49e5f028045..5ff0b69764f 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -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); |