st/mesa: simplify integer texture check

Just use the gl_texture_object::_IsInteger field instead of
computing it from scratch.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Brian Paul
2013-12-13 09:26:24 -07:00
parent b5cc710473
commit eff11b5a4a

View File

@@ -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] =
{