fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vc4: Drop VC4_DIRTY_TEXSTATE in favor of the per-stage flags.

Browse source 
The compiler uses the per-stage flags already, so it didn't need this.
vc4_uniforms was using it, so just replace it with both of the stage flags
for now.
This commit is contained in:
Eric Anholt 2016-07-14 17:38:43 -07:00
parent 5db82e0c89
commit 88152d7dc0
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/vc4/vc4_context.h
View file

@ -49,7 +49,6 @@
#define VC4_DIRTY_ZSA (1 << 2) #define VC4_DIRTY_ZSA (1 << 2)
#define VC4_DIRTY_FRAGTEX (1 << 3) #define VC4_DIRTY_FRAGTEX (1 << 3)
#define VC4_DIRTY_VERTTEX (1 << 4) #define VC4_DIRTY_VERTTEX (1 << 4)
#define VC4_DIRTY_TEXSTATE (1 << 5)
#define VC4_DIRTY_BLEND_COLOR (1 << 7) #define VC4_DIRTY_BLEND_COLOR (1 << 7)
#define VC4_DIRTY_STENCIL_REF (1 << 8) #define VC4_DIRTY_STENCIL_REF (1 << 8)

2
src/gallium/drivers/vc4/vc4_program.c
View file

@ -2352,7 +2352,6 @@ vc4_update_compiled_fs(struct vc4_context *vc4, uint8_t prim_mode)
VC4_DIRTY_RASTERIZER | VC4_DIRTY_RASTERIZER |
VC4_DIRTY_SAMPLE_MASK | VC4_DIRTY_SAMPLE_MASK |
VC4_DIRTY_FRAGTEX | VC4_DIRTY_FRAGTEX |
VC4_DIRTY_TEXSTATE |
VC4_DIRTY_UNCOMPILED_FS))) { VC4_DIRTY_UNCOMPILED_FS))) {
return; return;
} }
@ -2421,7 +2420,6 @@ vc4_update_compiled_vs(struct vc4_context *vc4, uint8_t prim_mode)
if (!(vc4->dirty & (VC4_DIRTY_PRIM_MODE | if (!(vc4->dirty & (VC4_DIRTY_PRIM_MODE |
VC4_DIRTY_RASTERIZER | VC4_DIRTY_RASTERIZER |
VC4_DIRTY_VERTTEX | VC4_DIRTY_VERTTEX |
VC4_DIRTY_TEXSTATE |
VC4_DIRTY_VTXSTATE | VC4_DIRTY_VTXSTATE |
VC4_DIRTY_UNCOMPILED_VS | VC4_DIRTY_UNCOMPILED_VS |
VC4_DIRTY_COMPILED_FS))) { VC4_DIRTY_COMPILED_FS))) {

4
src/gallium/drivers/vc4/vc4_state.c
View file

@ -482,8 +482,6 @@ vc4_set_framebuffer_state(struct pipe_context *pctx,
static struct vc4_texture_stateobj * static struct vc4_texture_stateobj *
vc4_get_stage_tex(struct vc4_context *vc4, unsigned shader) vc4_get_stage_tex(struct vc4_context *vc4, unsigned shader)
{ {
vc4->dirty |= VC4_DIRTY_TEXSTATE;
switch (shader) { switch (shader) {
case PIPE_SHADER_FRAGMENT: case PIPE_SHADER_FRAGMENT:
vc4->dirty |= VC4_DIRTY_FRAGTEX; vc4->dirty |= VC4_DIRTY_FRAGTEX;
@ -668,8 +666,6 @@ vc4_set_sampler_views(struct pipe_context *pctx, unsigned shader,
assert(start == 0); assert(start == 0);
vc4->dirty |= VC4_DIRTY_TEXSTATE;
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
if (views[i]) if (views[i])
new_nr = i + 1; new_nr = i + 1;

5
src/gallium/drivers/vc4/vc4_uniforms.c
View file

@ -375,7 +375,10 @@ vc4_set_shader_uniform_dirty_flags(struct vc4_compiled_shader *shader)
case QUNIFORM_TEXTURE_MSAA_ADDR: case QUNIFORM_TEXTURE_MSAA_ADDR:
case QUNIFORM_TEXRECT_SCALE_X: case QUNIFORM_TEXRECT_SCALE_X:
case QUNIFORM_TEXRECT_SCALE_Y: case QUNIFORM_TEXRECT_SCALE_Y:
dirty |= VC4_DIRTY_TEXSTATE; /* We could flag this on just the stage we're
* compiling for, but it's not passed in.
*/
dirty |= VC4_DIRTY_FRAGTEX | VC4_DIRTY_VERTTEX;
break; break;
case QUNIFORM_BLEND_CONST_COLOR_X: case QUNIFORM_BLEND_CONST_COLOR_X: