On 01/17/2017 08:14 AM, Kenneth Graunke wrote: > struct brw_cache_item is an implementation detail of the program cache. > We don't need to make those internals available to the entire driver. > > Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> > --- > src/mesa/drivers/dri/i965/brw_context.h | 19 ------------------- > src/mesa/drivers/dri/i965/brw_program_cache.c | 18 ++++++++++++++++++ > 2 files changed, 18 insertions(+), 19 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_context.h > b/src/mesa/drivers/dri/i965/brw_context.h > index d5e42516307..aa1499a1fe1 100644 > --- a/src/mesa/drivers/dri/i965/brw_context.h > +++ b/src/mesa/drivers/dri/i965/brw_context.h > @@ -453,25 +453,6 @@ struct brw_ff_gs_prog_data { > */ > #define SHADER_TIME_STRIDE 64 > > -struct brw_cache_item { > - /** > - * Effectively part of the key, cache_id identifies what kind of state > - * buffer is involved, and also which dirty flag should set. > - */ > - enum brw_cache_id cache_id; > - /** 32-bit hash of the key data */ > - GLuint hash; > - GLuint key_size; /* for variable-sized keys */ > - GLuint aux_size; > - const void *key; > - > - uint32_t offset; > - uint32_t size; > - > - struct brw_cache_item *next; > -}; > - > - > struct brw_cache { > struct brw_context *brw; > > diff --git a/src/mesa/drivers/dri/i965/brw_program_cache.c > b/src/mesa/drivers/dri/i965/brw_program_cache.c > index 44d9994de01..4d249ba6f93 100644 > --- a/src/mesa/drivers/dri/i965/brw_program_cache.c > +++ b/src/mesa/drivers/dri/i965/brw_program_cache.c > @@ -55,6 +55,24 @@ > > #define FILE_DEBUG_FLAG DEBUG_STATE > > +struct brw_cache_item { > + /** > + * Effectively part of the key, cache_id identifies what kind of state > + * buffer is involved, and also which dirty flag should set. > + */ >
Maybe a good opportunity to move the comment above outside, right on top of "struct brw_cache_item", for consistency with other symbol comments here. > + enum brw_cache_id cache_id; > + /** 32-bit hash of the key data */ > /* 32-bit hash of the key data */ (single start instead) Reviewed-by: Eduardo Lima Mitev <el...@igalia.com> > + GLuint hash; > + GLuint key_size; /* for variable-sized keys */ > + GLuint aux_size; > + const void *key; > + > + uint32_t offset; > + uint32_t size; > + > + struct brw_cache_item *next; > +}; > + > static unsigned > get_program_string_id(enum brw_cache_id cache_id, const void *key) > { > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev