fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: don't update clip state on VS changes if it has no effect

Browse source 
Tested-by: Edmondo Tommasina <edmondo.tommasina@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-08-02 15:26:19 +02:00
parent 412bd7360c
commit 0be30ea1a8
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/state_tracker/st_atom.c
View file

@ -65,7 +65,7 @@ static void check_program_state( struct st_context *st )
struct gl_context *ctx = st->ctx;
if (ctx->VertexProgram._Current != &st->vp->Base)
st->dirty |= ST_NEW_VERTEX_PROGRAM;
st->dirty |= ST_NEW_VERTEX_PROGRAM(st);
if (ctx->FragmentProgram._Current != &st->fp->Base)
st->dirty |= ST_NEW_FRAGMENT_PROGRAM;
@ -97,7 +97,7 @@ static void check_attrib_edgeflag(struct st_context *st)
arrays[VERT_ATTRIB_EDGEFLAG]->StrideB != 0;
if (vertdata_edgeflags != st->vertdata_edgeflags) {
st->vertdata_edgeflags = vertdata_edgeflags;
st->dirty |= ST_NEW_VERTEX_PROGRAM;
st->dirty |= ST_NEW_VERTEX_PROGRAM(st);
}
edgeflag_culls_prims = edgeflags_enabled && !vertdata_edgeflags &&

23
src/mesa/state_tracker/st_atom.h
View file

@ -88,17 +88,18 @@ enum {
ST_NEW_SAMPLE_MASK | \
ST_NEW_SAMPLE_SHADING)
#define ST_NEW_VERTEX_PROGRAM (ST_NEW_VS_STATE | \
ST_NEW_VS_SAMPLER_VIEWS | \
ST_NEW_VS_IMAGES | \
ST_NEW_VS_CONSTANTS | \
ST_NEW_VS_UBOS | \
ST_NEW_VS_ATOMICS | \
ST_NEW_VS_SSBOS | \
ST_NEW_VERTEX_ARRAYS | \
ST_NEW_CLIP_STATE | \
ST_NEW_RASTERIZER | \
ST_NEW_RENDER_SAMPLERS)
#define ST_NEW_VERTEX_PROGRAM(st) (ST_NEW_VS_STATE | \
ST_NEW_VS_SAMPLER_VIEWS | \
ST_NEW_VS_IMAGES | \
ST_NEW_VS_CONSTANTS | \
ST_NEW_VS_UBOS | \
ST_NEW_VS_ATOMICS | \
ST_NEW_VS_SSBOS | \
ST_NEW_VERTEX_ARRAYS | \
(st_user_clip_planes_enabled(st->ctx) ? \
ST_NEW_CLIP_STATE : 0) | \
ST_NEW_RASTERIZER | \
ST_NEW_RENDER_SAMPLERS)
#define ST_NEW_TCS_RESOURCES (ST_NEW_TCS_SAMPLER_VIEWS | \
ST_NEW_TCS_IMAGES | \

2
src/mesa/state_tracker/st_cb_feedback.c
View file

@ -297,7 +297,7 @@ st_RenderMode(struct gl_context *ctx, GLenum newMode )
/* Plug in new vbo draw function */
vbo_set_draw_func(ctx, st_feedback_draw_vbo);
/* need to generate/use a vertex program that emits pos/color/tex */
st->dirty |= ST_NEW_VERTEX_PROGRAM;
st->dirty |= ST_NEW_VERTEX_PROGRAM(st);
}
}

2
src/mesa/state_tracker/st_cb_program.c
View file

@ -215,7 +215,7 @@ st_program_string_notify( struct gl_context *ctx,
return false;
if (st->vp == stvp)
st->dirty |= ST_NEW_VERTEX_PROGRAM;
st->dirty |= ST_NEW_VERTEX_PROGRAM(st);
}
else if (target == GL_TESS_CONTROL_PROGRAM_NV) {
struct st_tessctrl_program *sttcp =