KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <imirkin@alum.mit.edu>
This commit is contained in:
Marek Olšák 2016-03-09 17:03:12 +01:00
parent e502801d98
commit af3454cad5
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/state_tracker/st_cb_compute.c
View File

@ -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++) {

2
src/mesa/state_tracker/st_context.c
View File

@ -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.

2
src/mesa/state_tracker/st_context.h
View File

@ -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)

4
src/mesa/state_tracker/st_draw.c
View File

@ -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);
}