From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 17 Sep 2007 21:44:59 +0000 (-0600)
Subject: Replace GL_TEXTURE_* tokens with PIPE_TEXTURE_*
X-Git-Tag: 062012170305~17580^2~390^2~4111
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffacb1c12a77d71613e8171e31ffc348959881e4;p=profile%2Fivi%2Fmesa.git

Replace GL_TEXTURE_* tokens with PIPE_TEXTURE_*

Must have missed this a while back.  This fixes cube mapping.
---

diff --git a/src/mesa/state_tracker/st_mipmap_tree.c b/src/mesa/state_tracker/st_mipmap_tree.c
index 535004c..1764bc6 100644
--- a/src/mesa/state_tracker/st_mipmap_tree.c
+++ b/src/mesa/state_tracker/st_mipmap_tree.c
@@ -180,18 +180,22 @@ st_miptree_depth_offsets(struct pipe_mipmap_tree *mt, GLuint level)
 {
    static const GLuint zero = 0;
 
-   if (mt->target != GL_TEXTURE_3D || mt->level[level].nr_images == 1)
+   if (mt->target != PIPE_TEXTURE_3D || mt->level[level].nr_images == 1)
       return &zero;
    else
       return mt->level[level].image_offset;
 }
 
 
+/**
+ * Return the offset to the given mipmap texture image within the
+ * texture memory buffer, in bytes.
+ */
 GLuint
 st_miptree_image_offset(const struct pipe_mipmap_tree * mt,
                         GLuint face, GLuint level)
 {
-   if (mt->target == GL_TEXTURE_CUBE_MAP_ARB)
+   if (mt->target == PIPE_TEXTURE_CUBE)
       return (mt->level[level].level_offset +
               mt->level[level].image_offset[face] * mt->cpp);
    else