diff options
| author | Luc Verhaegen <libv@skynet.be> | 2010-03-11 02:12:57 +0100 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2010-03-11 02:12:57 +0100 |
| commit | b7888315f673beb7efbda91dcc6ddc8ea57e8ca9 (patch) | |
| tree | 95094c9eb9e4a73f3477cad3bcdaf92be9ae0b3e | |
| parent | 49f9b1a0b7e2b99a0a962d9cf04aab9f854c47e0 (diff) | |
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/mga_texstate.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 0d89bec..2423b61 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script AC_PREREQ(2.57) -AC_INIT([mesa-dri-mga], 7.3.0, [], mesa-dri-mga) +AC_INIT([mesa-dri-mga], 7.4.0, [], mesa-dri-mga) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -16,8 +16,8 @@ AC_PROG_CC AC_HEADER_STDC PKG_CHECK_MODULES([DRM], [libdrm >= 2.3.0]) -PKG_CHECK_MODULES([DRI], [libmesadri >= 7.3.0 libmesadri < 7.4.0 - libmesadricommon >= 7.3.0 libmesadricommon < 7.4.0]) +PKG_CHECK_MODULES([DRI], [libmesadri >= 7.4.0 libmesadri < 7.5.0 + libmesadricommon >= 7.4.0 libmesadricommon < 7.5.0]) AC_OUTPUT([ Makefile diff --git a/src/mga_texstate.c b/src/mga_texstate.c index d4c5b6f..ad765d1 100644 --- a/src/mga_texstate.c +++ b/src/mga_texstate.c @@ -206,8 +206,8 @@ static void mgaUpdateTextureEnvG200( GLcontext *ctx, GLuint unit ) mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData; GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat; - if (tObj != ctx->Texture.Unit[0].Current2D && - tObj != ctx->Texture.Unit[0].CurrentRect) + if (tObj != ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX] && + tObj != ctx->Texture.Unit[0].CurrentTex[TEXTURE_RECT_INDEX]) return; @@ -635,8 +635,8 @@ static void mgaUpdateTextureEnvG400( GLcontext *ctx, GLuint unit ) mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData; GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat; - if (tObj != ctx->Texture.Unit[source].Current2D && - tObj != ctx->Texture.Unit[source].CurrentRect) + if (tObj != ctx->Texture.Unit[source].CurrentTex[TEXTURE_2D_INDEX] && + tObj != ctx->Texture.Unit[source].CurrentTex[TEXTURE_RECT_INDEX]) return; switch (ctx->Texture.Unit[source].EnvMode) { |