diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-30 08:30:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:30:25 +0200 |
| commit | af72dcd109d7610b96863035541250997c7a172e (patch) | |
| tree | ac1693ca03fe2564f8a63fa7373e459adb3a844f /mesalib/src/mesa/main/texparam.c | |
| parent | bee9191042416cbfb848615189ca1e2a0069f022 (diff) | |
| download | vcxsrv-af72dcd109d7610b96863035541250997c7a172e.tar.gz vcxsrv-af72dcd109d7610b96863035541250997c7a172e.tar.bz2 vcxsrv-af72dcd109d7610b96863035541250997c7a172e.zip | |
mesa xkeyboard-config git update 30 sep 2011
Diffstat (limited to 'mesalib/src/mesa/main/texparam.c')
| -rw-r--r-- | mesalib/src/mesa/main/texparam.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index 44dabe6de..f232cfc86 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/src/mesa/main/texparam.c @@ -62,8 +62,7 @@ validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap) } else if (target != GL_TEXTURE_RECTANGLE_NV && (wrap == GL_REPEAT || - (wrap == GL_MIRRORED_REPEAT && - e->ARB_texture_mirrored_repeat) || + wrap == GL_MIRRORED_REPEAT || (wrap == GL_MIRROR_CLAMP_EXT && (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) || (wrap == GL_MIRROR_CLAMP_TO_EDGE_EXT && @@ -534,13 +533,10 @@ set_tex_parameterf(struct gl_context *ctx, case GL_TEXTURE_LOD_BIAS: /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */ - if (ctx->Extensions.EXT_texture_lod_bias) { - if (texObj->Sampler.LodBias != params[0]) { - flush(ctx); - texObj->Sampler.LodBias = params[0]; - return GL_TRUE; - } - return GL_FALSE; + if (texObj->Sampler.LodBias != params[0]) { + flush(ctx); + texObj->Sampler.LodBias = params[0]; + return GL_TRUE; } break; @@ -1170,8 +1166,6 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params ) *params = (GLfloat) obj->Sampler.DepthMode; break; case GL_TEXTURE_LOD_BIAS: - if (!ctx->Extensions.EXT_texture_lod_bias) - goto invalid_pname; *params = obj->Sampler.LodBias; break; #if FEATURE_OES_draw_texture @@ -1313,8 +1307,6 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) *params = (GLint) obj->Sampler.DepthMode; break; case GL_TEXTURE_LOD_BIAS: - if (!ctx->Extensions.EXT_texture_lod_bias) - goto invalid_pname; *params = (GLint) obj->Sampler.LodBias; break; #if FEATURE_OES_draw_texture |