2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index bb6272a4a23..8eb59e20d8d 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -102,6 +102,8 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
 
    nv50->pipe.flush = nv50_flush;
 
+   if (!screen->cur_ctx)
+      screen->cur_ctx = nv50;
    screen->base.channel->user_private = nv50;
    screen->base.channel->flush_notify = nv50_default_flush_notify;
 
diff --git a/src/gallium/drivers/nvc0/nvc0_context.c b/src/gallium/drivers/nvc0/nvc0_context.c
index f02de4d044a..ebdf5f2f9e8 100644
--- a/src/gallium/drivers/nvc0/nvc0_context.c
+++ b/src/gallium/drivers/nvc0/nvc0_context.c
@@ -101,6 +101,8 @@ nvc0_create(struct pipe_screen *pscreen, void *priv)
 
    nvc0->pipe.flush = nvc0_flush;
 
+   if (!screen->cur_ctx)
+      screen->cur_ctx = nvc0;
    screen->base.channel->user_private = nvc0;
    screen->base.channel->flush_notify = nvc0_default_flush_notify;