diff options
| author | Mathias Fröhlich <[email protected]> | 2011-11-02 19:54:26 +0100 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2012-04-18 19:51:16 +0200 |
| commit | 86f53e6d6bd07e2bc3ffcadeb9a4418fbae06e0b (patch) | |
| tree | 459bd77668fb8a241d55a293ca97f367aec24f31 | |
| parent | 8ec18dfc1af43ef1f74c3f28c87e11da815f1958 (diff) | |
mesa: Use array object constructor.
This change uses the array object factory for gl_array_objects. This
prevents crashes when deriving from gl_array_object.
Reviewed-by: Brian Paul <[email protected]>
Signed-off-by: Mathias Froehlich <[email protected]>
| -rw-r--r-- | src/mesa/main/context.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 51b024143ad..a506981b451 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1118,7 +1118,8 @@ _mesa_free_context_data( struct gl_context *ctx ) _mesa_free_varray_data(ctx); _mesa_free_transform_feedback(ctx); - _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj); + _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj, NULL); + _mesa_reference_array_object(ctx, &ctx->Array.DefaultArrayObj, NULL); #if FEATURE_ARB_pixel_buffer_object _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, NULL); diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index a402c7b22dc..1c1484323bb 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1221,7 +1221,7 @@ _mesa_print_arrays(struct gl_context *ctx) void _mesa_init_varray(struct gl_context *ctx) { - ctx->Array.DefaultArrayObj = _mesa_new_array_object(ctx, 0); + ctx->Array.DefaultArrayObj = ctx->Driver.NewArrayObject(ctx, 0); _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj, ctx->Array.DefaultArrayObj); ctx->Array.ActiveTexture = 0; /* GL_ARB_multitexture */ |