Merge branch 'master' into asm-shader-rework-1

Conflicts:
	src/mesa/shader/arbprogparse.c

1 files changed, 0 insertions, 8 deletions

diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
index 6c617197ec..830e511fef 100644
--- a/src/gallium/state_trackers/dri/dri_context.c
+++ b/src/gallium/state_trackers/dri/dri_context.c
@@ -109,9 +109,6 @@ dri_destroy_context(__DRIcontextPrivate * cPriv)
     */
    st_flush(ctx->st, 0, NULL);
 
-   if (screen->dummyContext == ctx)
-      screen->dummyContext = NULL;
-
    /* Also frees ctx->pipe?
     */
    st_destroy_context(ctx->st);
@@ -153,11 +150,6 @@ dri_make_current(__DRIcontextPrivate * cPriv,
 
       ++ctx->bind_count;
 
-      /* This is for situations in which we need a rendering context but
-       * there may not be any currently bound.
-       */
-      screen->dummyContext = ctx;
-
       if (ctx->dPriv != driDrawPriv) {
 	 ctx->dPriv = driDrawPriv;
 	 ctx->d_stamp = driDrawPriv->lastStamp - 1;