diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-09-27 14:55:52 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-09-27 15:23:13 -0700 |
| commit | 7f11d471e6bafae2282ec82ba4a19d30c440d28f (patch) | |
| tree | fbdfebea41ca98836d97dde5bd8b14da60f63758 /src/mesa/main/texparam.c | |
| parent | 4da5f1b7c52fb02a3b2baa846931c2dd5ee1b92e (diff) | |
mesa: Force GL_SGIS_generate_mipmap to always be enabled
As per discussions at XDS.
Diffstat (limited to 'src/mesa/main/texparam.c')
| -rw-r--r-- | src/mesa/main/texparam.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 745a0aeec9..187049c070 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -291,17 +291,10 @@ set_tex_parameteri(GLcontext *ctx, return GL_TRUE; case GL_GENERATE_MIPMAP_SGIS: - if (ctx->Extensions.SGIS_generate_mipmap) { - if (texObj->GenerateMipmap != params[0]) { - flush(ctx, texObj); - texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE; - return GL_TRUE; - } - return GL_FALSE; - } - else { - _mesa_error(ctx, GL_INVALID_ENUM, - "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)"); + if (texObj->GenerateMipmap != params[0]) { + flush(ctx, texObj); + texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE; + return GL_TRUE; } return GL_FALSE; @@ -1126,11 +1119,7 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params ) error = GL_TRUE; break; case GL_GENERATE_MIPMAP_SGIS: - if (ctx->Extensions.SGIS_generate_mipmap) { - *params = (GLfloat) obj->GenerateMipmap; - } - else - error = GL_TRUE; + *params = (GLfloat) obj->GenerateMipmap; break; case GL_TEXTURE_COMPARE_MODE_ARB: if (ctx->Extensions.ARB_shadow) { @@ -1291,12 +1280,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) } break; case GL_GENERATE_MIPMAP_SGIS: - if (ctx->Extensions.SGIS_generate_mipmap) { - *params = (GLint) obj->GenerateMipmap; - } - else { - error = GL_TRUE; - } + *params = (GLint) obj->GenerateMipmap; break; case GL_TEXTURE_COMPARE_MODE_ARB: if (ctx->Extensions.ARB_shadow) { |