Mesa (gallium-rect-textures): mesa/st: use PIPE_TEXTURE_RECT for GL_TEXTURE_RECTANGLE
Luca Barbieri
lb at kemper.freedesktop.org
Wed Aug 18 18:45:14 UTC 2010
Module: Mesa
Branch: gallium-rect-textures
Commit: 338abab672939328d4b68024cf9494044dfc4103
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=338abab672939328d4b68024cf9494044dfc4103
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 | 4 +++-
src/mesa/state_tracker/st_texture.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 4c3e368..a3c1ce3 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;
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);
More information about the mesa-commit
mailing list