ilo: use shorter names for dirty flags

The new names match those of ilo_context's members respectively, and are
shorter.

1 files changed, 61 insertions, 58 deletions

diff --git a/src/gallium/drivers/ilo/ilo_state.h b/src/gallium/drivers/ilo/ilo_state.h
index 69ef9025c4f..48abcb1b373 100644
--- a/src/gallium/drivers/ilo/ilo_state.h
+++ b/src/gallium/drivers/ilo/ilo_state.h
@@ -40,36 +40,38 @@
  * there are not enough bits.
  */
 enum ilo_state {
-   ILO_STATE_BLEND,
-   ILO_STATE_FRAGMENT_SAMPLERS,
-   ILO_STATE_VERTEX_SAMPLERS,
-   ILO_STATE_GEOMETRY_SAMPLERS,
-   ILO_STATE_COMPUTE_SAMPLERS,
-   ILO_STATE_RASTERIZER,
-   ILO_STATE_DEPTH_STENCIL_ALPHA,
-   ILO_STATE_FS,
+   ILO_STATE_VB,
+   ILO_STATE_VE,
+   ILO_STATE_IB,
    ILO_STATE_VS,
    ILO_STATE_GS,
-   ILO_STATE_VERTEX_ELEMENTS,
-   ILO_STATE_BLEND_COLOR,
-   ILO_STATE_STENCIL_REF,
-   ILO_STATE_SAMPLE_MASK,
+   ILO_STATE_SO,
    ILO_STATE_CLIP,
-   ILO_STATE_CONSTANT_BUFFER,
-   ILO_STATE_FRAMEBUFFER,
-   ILO_STATE_POLY_STIPPLE,
-   ILO_STATE_SCISSOR,
    ILO_STATE_VIEWPORT,
-   ILO_STATE_FRAGMENT_SAMPLER_VIEWS,
-   ILO_STATE_VERTEX_SAMPLER_VIEWS,
-   ILO_STATE_GEOMETRY_SAMPLER_VIEWS,
-   ILO_STATE_COMPUTE_SAMPLER_VIEWS,
-   ILO_STATE_SHADER_RESOURCES,
-   ILO_STATE_VERTEX_BUFFERS,
-   ILO_STATE_INDEX_BUFFER,
-   ILO_STATE_STREAM_OUTPUT_TARGETS,
-   ILO_STATE_COMPUTE,
-   ILO_STATE_COMPUTE_RESOURCES,
+   ILO_STATE_SCISSOR,
+   ILO_STATE_RASTERIZER,
+   ILO_STATE_POLY_STIPPLE,
+   ILO_STATE_SAMPLE_MASK,
+   ILO_STATE_FS,
+   ILO_STATE_DSA,
+   ILO_STATE_STENCIL_REF,
+   ILO_STATE_BLEND,
+   ILO_STATE_BLEND_COLOR,
+   ILO_STATE_FB,
+
+   ILO_STATE_SAMPLER_VS,
+   ILO_STATE_SAMPLER_GS,
+   ILO_STATE_SAMPLER_FS,
+   ILO_STATE_SAMPLER_CS,
+   ILO_STATE_VIEW_VS,
+   ILO_STATE_VIEW_GS,
+   ILO_STATE_VIEW_FS,
+   ILO_STATE_VIEW_CS,
+   ILO_STATE_CBUF,
+   ILO_STATE_RESOURCE,
+
+   ILO_STATE_CS,
+   ILO_STATE_CS_RESOURCE,
    ILO_STATE_GLOBAL_BINDING,
 
    ILO_STATE_COUNT,
@@ -79,40 +81,41 @@ enum ilo_state {
  * Dirty flags of the states.
  */
 enum ilo_dirty_flags {
-   ILO_DIRTY_BLEND                    = 1 << ILO_STATE_BLEND,
-   ILO_DIRTY_FRAGMENT_SAMPLERS        = 1 << ILO_STATE_FRAGMENT_SAMPLERS,
-   ILO_DIRTY_VERTEX_SAMPLERS          = 1 << ILO_STATE_VERTEX_SAMPLERS,
-   ILO_DIRTY_GEOMETRY_SAMPLERS        = 1 << ILO_STATE_GEOMETRY_SAMPLERS,
-   ILO_DIRTY_COMPUTE_SAMPLERS         = 1 << ILO_STATE_COMPUTE_SAMPLERS,
-   ILO_DIRTY_RASTERIZER               = 1 << ILO_STATE_RASTERIZER,
-   ILO_DIRTY_DEPTH_STENCIL_ALPHA      = 1 << ILO_STATE_DEPTH_STENCIL_ALPHA,
-   ILO_DIRTY_FS                       = 1 << ILO_STATE_FS,
-   ILO_DIRTY_VS                       = 1 << ILO_STATE_VS,
-   ILO_DIRTY_GS                       = 1 << ILO_STATE_GS,
-   ILO_DIRTY_VERTEX_ELEMENTS          = 1 << ILO_STATE_VERTEX_ELEMENTS,
-   ILO_DIRTY_BLEND_COLOR              = 1 << ILO_STATE_BLEND_COLOR,
-   ILO_DIRTY_STENCIL_REF              = 1 << ILO_STATE_STENCIL_REF,
-   ILO_DIRTY_SAMPLE_MASK              = 1 << ILO_STATE_SAMPLE_MASK,
-   ILO_DIRTY_CLIP                     = 1 << ILO_STATE_CLIP,
-   ILO_DIRTY_CONSTANT_BUFFER          = 1 << ILO_STATE_CONSTANT_BUFFER,
-   ILO_DIRTY_FRAMEBUFFER              = 1 << ILO_STATE_FRAMEBUFFER,
-   ILO_DIRTY_POLY_STIPPLE             = 1 << ILO_STATE_POLY_STIPPLE,
-   ILO_DIRTY_SCISSOR                  = 1 << ILO_STATE_SCISSOR,
-   ILO_DIRTY_VIEWPORT                 = 1 << ILO_STATE_VIEWPORT,
-   ILO_DIRTY_FRAGMENT_SAMPLER_VIEWS   = 1 << ILO_STATE_FRAGMENT_SAMPLER_VIEWS,
-   ILO_DIRTY_VERTEX_SAMPLER_VIEWS     = 1 << ILO_STATE_VERTEX_SAMPLER_VIEWS,
-   ILO_DIRTY_GEOMETRY_SAMPLER_VIEWS   = 1 << ILO_STATE_GEOMETRY_SAMPLER_VIEWS,
-   ILO_DIRTY_COMPUTE_SAMPLER_VIEWS    = 1 << ILO_STATE_COMPUTE_SAMPLER_VIEWS,
-   ILO_DIRTY_SHADER_RESOURCES         = 1 << ILO_STATE_SHADER_RESOURCES,
-   ILO_DIRTY_VERTEX_BUFFERS           = 1 << ILO_STATE_VERTEX_BUFFERS,
-   ILO_DIRTY_INDEX_BUFFER             = 1 << ILO_STATE_INDEX_BUFFER,
-   ILO_DIRTY_STREAM_OUTPUT_TARGETS    = 1 << ILO_STATE_STREAM_OUTPUT_TARGETS,
-   ILO_DIRTY_COMPUTE                  = 1 << ILO_STATE_COMPUTE,
-   ILO_DIRTY_COMPUTE_RESOURCES        = 1 << ILO_STATE_COMPUTE_RESOURCES,
-   ILO_DIRTY_GLOBAL_BINDING           = 1 << ILO_STATE_GLOBAL_BINDING,
-   ILO_DIRTY_ALL                      = 0xffffffff,
+   ILO_DIRTY_VB               = 1 << ILO_STATE_VB,
+   ILO_DIRTY_VE               = 1 << ILO_STATE_VE,
+   ILO_DIRTY_IB               = 1 << ILO_STATE_IB,
+   ILO_DIRTY_VS               = 1 << ILO_STATE_VS,
+   ILO_DIRTY_GS               = 1 << ILO_STATE_GS,
+   ILO_DIRTY_SO               = 1 << ILO_STATE_SO,
+   ILO_DIRTY_CLIP             = 1 << ILO_STATE_CLIP,
+   ILO_DIRTY_VIEWPORT         = 1 << ILO_STATE_VIEWPORT,
+   ILO_DIRTY_SCISSOR          = 1 << ILO_STATE_SCISSOR,
+   ILO_DIRTY_RASTERIZER       = 1 << ILO_STATE_RASTERIZER,
+   ILO_DIRTY_POLY_STIPPLE     = 1 << ILO_STATE_POLY_STIPPLE,
+   ILO_DIRTY_SAMPLE_MASK      = 1 << ILO_STATE_SAMPLE_MASK,
+   ILO_DIRTY_FS               = 1 << ILO_STATE_FS,
+   ILO_DIRTY_DSA              = 1 << ILO_STATE_DSA,
+   ILO_DIRTY_STENCIL_REF      = 1 << ILO_STATE_STENCIL_REF,
+   ILO_DIRTY_BLEND            = 1 << ILO_STATE_BLEND,
+   ILO_DIRTY_BLEND_COLOR      = 1 << ILO_STATE_BLEND_COLOR,
+   ILO_DIRTY_FB               = 1 << ILO_STATE_FB,
+   ILO_DIRTY_SAMPLER_VS       = 1 << ILO_STATE_SAMPLER_VS,
+   ILO_DIRTY_SAMPLER_GS       = 1 << ILO_STATE_SAMPLER_GS,
+   ILO_DIRTY_SAMPLER_FS       = 1 << ILO_STATE_SAMPLER_FS,
+   ILO_DIRTY_SAMPLER_CS       = 1 << ILO_STATE_SAMPLER_CS,
+   ILO_DIRTY_VIEW_VS          = 1 << ILO_STATE_VIEW_VS,
+   ILO_DIRTY_VIEW_GS          = 1 << ILO_STATE_VIEW_GS,
+   ILO_DIRTY_VIEW_FS          = 1 << ILO_STATE_VIEW_FS,
+   ILO_DIRTY_VIEW_CS          = 1 << ILO_STATE_VIEW_CS,
+   ILO_DIRTY_CBUF             = 1 << ILO_STATE_CBUF,
+   ILO_DIRTY_RESOURCE         = 1 << ILO_STATE_RESOURCE,
+   ILO_DIRTY_CS               = 1 << ILO_STATE_CS,
+   ILO_DIRTY_CS_RESOURCE      = 1 << ILO_STATE_CS_RESOURCE,
+   ILO_DIRTY_GLOBAL_BINDING   = 1 << ILO_STATE_GLOBAL_BINDING,
+   ILO_DIRTY_ALL              = 0xffffffff,
 };
 
+struct pipe_draw_info;
 struct pipe_resource;
 struct ilo_context;