st/mesa: add some const qualifiers in st_atom_texture.c
authorBrian Paul <brianp@vmware.com>
Fri, 23 Sep 2016 18:24:03 +0000 (12:24 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 6 Oct 2016 17:29:32 +0000 (11:29 -0600)
And minor code reformatting.

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/mesa/state_tracker/st_atom_texture.c

index 113c0ed1b06034f575da0d1ff49c3405aa2d8db6..86f1c62e752245bae401100066a9c24a089e50e4 100644 (file)
@@ -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,