diff options
| author | Eric Anholt <[email protected]> | 2015-01-11 14:52:26 +1300 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2015-01-11 17:17:20 +1300 |
| commit | 1a328120d334ae09fa6a1ce8b599174f730a9753 (patch) | |
| tree | 467363a40f8e817b983c9baa9c1200ceda55f030 /src/gallium/drivers/vc4/vc4_context.h | |
| parent | c1226629846613f9442e5fc5ad9be305176a4f0f (diff) | |
vc4: Fix up statechange management for uncompiled/compiled FS/VS.
No need to recheck the FS compile when the VS source has changed, but
there *is* a need to recheck the VS compile when the compiled VS has
changed (since the live inputs may change).
Fixes es3conform's blend test.
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_context.h')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_context.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/vc4/vc4_context.h b/src/gallium/drivers/vc4/vc4_context.h index 90a68e5c28e..e3d797e02b8 100644 --- a/src/gallium/drivers/vc4/vc4_context.h +++ b/src/gallium/drivers/vc4/vc4_context.h @@ -44,7 +44,7 @@ #define VC4_DIRTY_FRAGTEX (1 << 3) #define VC4_DIRTY_VERTTEX (1 << 4) #define VC4_DIRTY_TEXSTATE (1 << 5) -#define VC4_DIRTY_PROG (1 << 6) + #define VC4_DIRTY_BLEND_COLOR (1 << 7) #define VC4_DIRTY_STENCIL_REF (1 << 8) #define VC4_DIRTY_SAMPLE_MASK (1 << 9) @@ -59,9 +59,9 @@ #define VC4_DIRTY_FLAT_SHADE_FLAGS (1 << 18) #define VC4_DIRTY_PRIM_MODE (1 << 19) #define VC4_DIRTY_CLIP (1 << 20) - -#define VC4_SHADER_DIRTY_VP (1 << 0) -#define VC4_SHADER_DIRTY_FP (1 << 1) +#define VC4_DIRTY_UNCOMPILED_VS (1 << 21) +#define VC4_DIRTY_UNCOMPILED_FS (1 << 22) +#define VC4_DIRTY_COMPILED_FS (1 << 24) struct vc4_texture_stateobj { struct pipe_sampler_view *textures[PIPE_MAX_SAMPLERS]; @@ -139,7 +139,6 @@ struct vc4_compiled_shader { struct vc4_program_stateobj { struct vc4_uncompiled_shader *bind_vs, *bind_fs; struct vc4_compiled_shader *cs, *vs, *fs; - uint32_t dirty; uint8_t num_exports; /* Indexed by semantic name or TGSI_SEMANTIC_COUNT + semantic index * for TGSI_SEMANTIC_GENERIC. Special vs exports (position and point- |