diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-12 14:26:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-12 14:26:41 +0100 |
| commit | 2b5652fc7742c5ac57aca701214b046626a729e9 (patch) | |
| tree | a994b9e63a32a7c061bcfb563aa22369c217e49c /mesalib/src/mesa/main/texparam.c | |
| parent | 2331d6e4ac699e775ccee07a8a461cae0a98033a (diff) | |
| parent | 5efb0a5e19b75137b7294b27f4e7878aeb8f0927 (diff) | |
| download | vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.tar.gz vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.tar.bz2 vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/texparam.c')
| -rw-r--r-- | mesalib/src/mesa/main/texparam.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index f4ec63388..0f92a5b98 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/src/mesa/main/texparam.c @@ -1114,8 +1114,7 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params ) } break; case GL_TEXTURE_RESIDENT: - *params = ctx->Driver.IsTextureResident ? - ctx->Driver.IsTextureResident(ctx, obj) : 1.0F; + *params = 1.0F; break; case GL_TEXTURE_PRIORITY: *params = obj->Priority; @@ -1261,8 +1260,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) } break;; case GL_TEXTURE_RESIDENT: - *params = ctx->Driver.IsTextureResident ? - ctx->Driver.IsTextureResident(ctx, obj) : 1; + *params = 1; break;; case GL_TEXTURE_PRIORITY: *params = FLOAT_TO_INT(obj->Priority); |