fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: add const qualifiers in sampler validation code

Browse source 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Brian Paul 2013-12-13 09:33:49 -07:00
parent 9f9860b004
commit 31b0e7d024
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/state_tracker/st_atom_sampler.c
View file

@ -130,7 +130,7 @@ convert_sampler(struct st_context *st,
struct pipe_sampler_state *sampler,
GLuint texUnit)
{
struct gl_texture_object *texobj;
const struct gl_texture_object *texobj;
struct gl_context *ctx = st->ctx;
struct gl_sampler_object *msamp;
@ -175,8 +175,8 @@ convert_sampler(struct st_context *st,
msamp->BorderColor.ui[1] ||
msamp->BorderColor.ui[2] ||
msamp->BorderColor.ui[3]) {
struct st_texture_object *stobj = st_texture_object(texobj);
struct gl_texture_image *teximg;
const struct st_texture_object *stobj = st_texture_object_const(texobj);
const struct gl_texture_image *teximg;
const GLboolean is_integer = texobj->_IsIntegerFormat;
union pipe_color_union border_color;

6
src/mesa/state_tracker/st_texture.h
View file

@ -112,6 +112,12 @@ st_texture_object(struct gl_texture_object *obj)
return (struct st_texture_object *) obj;
}
static INLINE const struct st_texture_object *
st_texture_object_const(const struct gl_texture_object *obj)
{
return (const struct st_texture_object *) obj;
}
static INLINE struct pipe_resource *
st_get_texobj_resource(struct gl_texture_object *texObj)