st/dri: remove dead code and incorrect comment around make_current
authorMarek Olšák <marek.olsak@amd.com>
Sat, 18 Nov 2017 23:24:40 +0000 (00:24 +0100)
committerMarek Olšák <marek.olsak@amd.com>
Sat, 25 Nov 2017 16:16:56 +0000 (17:16 +0100)
Core Mesa already handles flushing based on ContextReleaseBehavior,
so the comment is wrong.

Also, old_st is always NULL, because unbind_context always precedes
make_current.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/gallium/state_trackers/dri/dri_context.c

index f5400ab21e65c4eb2abd88c57d33f6a4e026fdc9..d123f9c55348de51b0ecf01f52194b670ed98569 100644 (file)
@@ -236,11 +236,6 @@ dri_unbind_context(__DRIcontext * cPriv)
          if (st->thread_finish)
             st->thread_finish(st);
 
-         /* For conformance, unbind is supposed to flush the context.
-          * However, if we do it here we might end up flushing a partially
-          * destroyed context. Instead, we flush in dri_make_current and
-          * in dri_destroy_context which should cover all the cases.
-          */
          stapi->make_current(stapi, NULL, NULL, NULL);
       }
    }
@@ -257,14 +252,6 @@ dri_make_current(__DRIcontext * cPriv,
    struct dri_context *ctx = dri_context(cPriv);
    struct dri_drawable *draw = dri_drawable(driDrawPriv);
    struct dri_drawable *read = dri_drawable(driReadPriv);
-   struct st_context_iface *old_st = ctx->stapi->get_current(ctx->stapi);
-
-   if (old_st && old_st->thread_finish)
-      old_st->thread_finish(old_st);
-
-   /* Flush the old context here so we don't have to flush on unbind() */
-   if (old_st && old_st != ctx->st)
-      old_st->flush(old_st, ST_FLUSH_FRONT, NULL);
 
    ++ctx->bind_count;