From 628e651f64f1d90c0c56ff02f752ed45e82a50a4 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 23 Sep 2016 12:24:03 -0600 Subject: st/mesa: add some const qualifiers in st_atom_texture.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And minor code reformatting. Reviewed-by: Edward O'Callaghan Reviewed-by: Nicolai Hähnle Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_atom_texture.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index 113c0ed1b06..86f1c62e752 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -241,7 +241,7 @@ get_texture_format_swizzle(const struct st_context *st, static boolean check_sampler_swizzle(const struct st_context *st, const struct st_texture_object *stObj, - struct pipe_sampler_view *sv, unsigned glsl_version) + const struct pipe_sampler_view *sv, unsigned glsl_version) { unsigned swizzle = get_texture_format_swizzle(st, stObj, glsl_version); @@ -252,7 +252,8 @@ check_sampler_swizzle(const struct st_context *st, } -static unsigned last_level(struct st_texture_object *stObj) +static unsigned +last_level(const struct st_texture_object *stObj) { unsigned ret = MIN2(stObj->base.MinLevel + stObj->base._MaxLevel, stObj->pt->last_level); @@ -261,7 +262,8 @@ static unsigned last_level(struct st_texture_object *stObj) return ret; } -static unsigned last_layer(struct st_texture_object *stObj) +static unsigned +last_layer(const struct st_texture_object *stObj) { if (stObj->base.Immutable && stObj->pt->array_size > 1) return MIN2(stObj->base.MinLayer + stObj->base.NumLayers - 1, -- cgit v1.2.3