From: Brian Paul Date: Fri, 23 Sep 2016 18:18:46 +0000 (-0600) Subject: st/mesa: simplify some code in get_texture_format_swizzle() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b3c89351659646be12763133535e360ea57a6058;p=mesa.git st/mesa: simplify some code in get_texture_format_swizzle() There's no need to cast to st_texture_image. Just use gl_texture_image. Reviewed-by: Edward O'Callaghan Reviewed-by: Nicolai Hähnle Reviewed-by: Marek Olšák --- diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index efc8c90ffae..113c0ed1b06 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -211,11 +211,11 @@ get_texture_format_swizzle(const struct st_context *st, */ if (_mesa_is_gles3(st->ctx) && util_format_is_depth_or_stencil(stObj->pt->format)) { - const struct st_texture_image *firstImage = - st_texture_image_const(_mesa_base_tex_image(&stObj->base)); - if (firstImage->base.InternalFormat != GL_DEPTH_COMPONENT && - firstImage->base.InternalFormat != GL_DEPTH_STENCIL && - firstImage->base.InternalFormat != GL_STENCIL_INDEX) + const struct gl_texture_image *firstImage = + _mesa_base_tex_image(&stObj->base); + if (firstImage->InternalFormat != GL_DEPTH_COMPONENT && + firstImage->InternalFormat != GL_DEPTH_STENCIL && + firstImage->InternalFormat != GL_STENCIL_INDEX) depth_mode = GL_RED; } tex_swizzle = compute_texture_format_swizzle(baseFormat,