diff options
| author | Brian Paul <[email protected]> | 2013-12-13 09:26:24 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-12-13 16:06:06 -0700 |
| commit | eff11b5a4ac41e3a8a626a6445e63ab0322db351 (patch) | |
| tree | 5b40f105074ddf0ec80c7b33620db25c1232891f | |
| parent | b5cc7104739313b15413441325b11a51b7581e3e (diff) | |
st/mesa: simplify integer texture check
Just use the gl_texture_object::_IsInteger field instead of
computing it from scratch.
Reviewed-by: Roland Scheidegger <[email protected]>
| -rw-r--r-- | src/mesa/state_tracker/st_atom_sampler.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index 302e1298143..989e42c08cd 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -170,21 +170,18 @@ convert_sampler(struct st_context *st, assert(sampler->min_lod <= sampler->max_lod); } + /* For non-black borders... */ if (msamp->BorderColor.ui[0] || 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; - GLboolean is_integer = GL_FALSE; + const GLboolean is_integer = texobj->_IsIntegerFormat; union pipe_color_union border_color; teximg = texobj->Image[0][texobj->BaseLevel]; - if (teximg) { - is_integer = _mesa_is_enum_format_integer(teximg->InternalFormat); - } - if (st->apply_texture_swizzle_to_border_color && stobj->sampler_view) { const unsigned char swz[4] = { |