Module: Mesa Branch: master Commit: b3c89351659646be12763133535e360ea57a6058 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3c89351659646be12763133535e360ea57a6058
Author: Brian Paul <[email protected]> Date: Fri Sep 23 12:18:46 2016 -0600 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 <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> Reviewed-by: Marek Olšák <[email protected]> --- 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, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
