vbo: merge use_buffer_objects into vbo_CreateContext to skip the big malloc

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_context.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 8fec35237c0917686e9e00277f45b9f95050e020..a63e0a19ddddd9983ce91aabbdb3114f906c346f 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -133,7 +133,7 @@ nouveau_context_init(struct gl_context *ctx, gl_api api,
        nouveau_scratch_init(ctx);
        _mesa_meta_init(ctx);
        _swrast_CreateContext(ctx);
-       _vbo_CreateContext(ctx);
+       _vbo_CreateContext(ctx, true);
        _tnl_CreateContext(ctx);
        nouveau_span_functions_init(ctx);
        _mesa_allow_light_in_model(ctx, GL_FALSE);
@@ -217,7 +217,7 @@ nouveau_context_deinit(struct gl_context *ctx)
        nouveau_object_del(&nctx->hw.chan);
 
        nouveau_scratch_destroy(ctx);
-       _mesa_free_context_data(ctx, true);
+       _mesa_free_context_data(ctx);
 }
 
 void
@@ -250,11 +250,11 @@ nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw)
                attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
        if (fb->Visual.doubleBufferMode)
                attachments[i++] = __DRI_BUFFER_BACK_LEFT;
-       if (fb->Visual.haveDepthBuffer && fb->Visual.haveStencilBuffer)
+       if (fb->Visual.depthBits > 0 && fb->Visual.stencilBits > 0)
                attachments[i++] = __DRI_BUFFER_DEPTH_STENCIL;
-       else if (fb->Visual.haveDepthBuffer)
+       else if (fb->Visual.depthBits > 0)
                attachments[i++] = __DRI_BUFFER_DEPTH;
-       else if (fb->Visual.haveStencilBuffer)
+       else if (fb->Visual.stencilBits > 0)
                attachments[i++] = __DRI_BUFFER_STENCIL;
 
        buffers = screen->dri2.loader->getBuffers(draw, &draw->w, &draw->h,