From: Brian Paul <brianp@vmware.com>
Date: Tue, 16 Feb 2016 17:22:32 +0000 (-0700)
Subject: st/mesa: used _mesa_num_tex_faces() in st_finalize_texture()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4277618235b229f46cf5570908d10ed810198d76;p=mesa.git

st/mesa: used _mesa_num_tex_faces() in st_finalize_texture()

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index a4c4648c484..09ff4c12f2a 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -2739,7 +2739,7 @@ st_finalize_texture(struct gl_context *ctx,
 {
    struct st_context *st = st_context(ctx);
    struct st_texture_object *stObj = st_texture_object(tObj);
-   const GLuint nr_faces = (stObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
+   const GLuint nr_faces = _mesa_num_tex_faces(stObj->base.Target);
    GLuint face;
    const struct st_texture_image *firstImage;
    enum pipe_format firstImageFormat;