Mesa (master): mesa/st: use PIPE_TEXTURE_RECT for GL_TEXTURE_RECTANGLE

[Luca Barbieri]

Module: Mesa
Branch: master
Commit: 7f15dca6d963b0a69131e8761c477064dba49307
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f15dca6d963b0a69131e8761c477064dba49307

Author: Luca Barbieri <luca at luca-barbieri.com>
Date:   Thu Apr 15 09:04:20 2010 +0200

mesa/st: use PIPE_TEXTURE_RECT for GL_TEXTURE_RECTANGLE

---

 src/mesa/state_tracker/st_cb_texture.c |    6 ++++--
 src/mesa/state_tracker/st_texture.c    |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 4c3e368..a41c780 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -74,9 +74,11 @@ gl_target_to_pipe(GLenum target)
       return PIPE_TEXTURE_1D;
 
    case GL_TEXTURE_2D:
-   case GL_TEXTURE_RECTANGLE_NV:
       return PIPE_TEXTURE_2D;
 
+   case GL_TEXTURE_RECTANGLE_NV:
+      return PIPE_TEXTURE_RECT;
+
    case GL_TEXTURE_3D:
       return PIPE_TEXTURE_3D;
 
@@ -449,7 +451,7 @@ compress_with_blit(GLcontext * ctx,
    /* Create the temporary source texture
     */
    memset(&templ, 0, sizeof(templ));
-   templ.target = PIPE_TEXTURE_2D;
+   templ.target = st->internal_target;
    templ.format = st_mesa_format_to_pipe_format(mesa_format);
    templ.width0 = width;
    templ.height0 = height;
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index add6e94..c6cf2ba 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -64,7 +64,7 @@ st_texture_create(struct st_context *st,
    struct pipe_resource pt, *newtex;
    struct pipe_screen *screen = st->pipe->screen;
 
-   assert(target <= PIPE_TEXTURE_CUBE);
+   assert(target < PIPE_MAX_TEXTURE_TYPES);
    assert(width0 > 0);
    assert(height0 > 0);
    assert(depth0 > 0);