From b3c89351659646be12763133535e360ea57a6058 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 23 Sep 2016 12:18:46 -0600 Subject: [PATCH] st/mesa: simplify some code in get_texture_format_swizzle() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/mesa/state_tracker/st_atom_texture.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index efc8c90..113c0ed 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, -- 2.7.4