diff options
| author | Marek Olšák <[email protected]> | 2016-03-09 17:03:12 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-03-11 16:07:18 +0100 |
| commit | af3454cad58be3df63c7fe6caf9604f651a6ce54 (patch) | |
| tree | 7cdc8501123554359c3eae68902c84fcf9fc7ce3 /src/mesa/state_tracker | |
| parent | e502801d9843984233426f1b31e42bf6095d63be (diff) | |
st/mesa: remove ST_NEW_MESA flag (v2)
Only used indirectly when checking dirty.st != 0
v2: also update st_cb_compute.c
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_compute.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_cb_compute.c b/src/mesa/state_tracker/st_cb_compute.c index 364159d62d8..bfc6d96cd57 100644 --- a/src/mesa/state_tracker/st_cb_compute.c +++ b/src/mesa/state_tracker/st_cb_compute.c @@ -47,7 +47,7 @@ static void st_dispatch_compute_common(struct gl_context *ctx, if (ctx->NewState) _mesa_update_state(ctx); - if (st->dirty_cp.st || ctx->NewDriverState) + if (st->dirty_cp.st || st->dirty_cp.mesa || ctx->NewDriverState) st_validate_state(st, ST_PIPELINE_COMPUTE); for (unsigned i = 0; i < 3; i++) { diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index e3ddee660f7..f5a6f8598ca 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -141,9 +141,7 @@ void st_invalidate_state(struct gl_context * ctx, GLbitfield new_state) /* Invalidate render and compute pipelines. */ st->dirty.mesa |= new_state; - st->dirty.st |= ST_NEW_MESA; st->dirty_cp.mesa |= new_state; - st->dirty_cp.st |= ST_NEW_MESA; /* This is the only core Mesa module we depend upon. * No longer use swrast, swsetup, tnl. diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index f960c64cbe8..ba51a9c6248 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -50,7 +50,7 @@ struct st_perf_monitor_group; struct u_upload_mgr; -#define ST_NEW_MESA (1 << 0) /* Mesa state has changed */ +/* gap */ #define ST_NEW_FRAGMENT_PROGRAM (1 << 1) #define ST_NEW_VERTEX_PROGRAM (1 << 2) #define ST_NEW_FRAMEBUFFER (1 << 3) diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 2de6620602d..fdd59a383a9 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -201,7 +201,7 @@ st_draw_vbo(struct gl_context *ctx, st_flush_bitmap_cache(st); /* Validate state. */ - if (st->dirty.st || ctx->NewDriverState) { + if (st->dirty.st || st->dirty.mesa || ctx->NewDriverState) { st_validate_state(st, ST_PIPELINE_RENDER); #if 0 @@ -314,7 +314,7 @@ st_indirect_draw_vbo(struct gl_context *ctx, assert(stride); /* Validate state. */ - if (st->dirty.st || ctx->NewDriverState) { + if (st->dirty.st || st->dirty.mesa || ctx->NewDriverState) { st_validate_state(st, ST_PIPELINE_RENDER); } |