diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/extensions.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/texstate.c | 20 |
3 files changed, 21 insertions, 6 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index ec4422daa21..f37c07d33dc 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -1,4 +1,4 @@ -/* $Id: extensions.c,v 1.82 2002/10/16 17:57:52 brianp Exp $ */ +/* $Id: extensions.c,v 1.83 2002/10/21 15:52:34 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -73,6 +73,7 @@ static struct { { OFF, "GL_ARB_texture_mirrored_repeat", F(ARB_texture_mirrored_repeat)}, { ON, "GL_ARB_transpose_matrix", 0 }, { ON, "GL_ARB_window_pos", F(ARB_window_pos) }, + { OFF, "GL_ATI_texture_mirror_once", F(ATI_texture_mirror_once)}, { ON, "GL_EXT_abgr", 0 }, { ON, "GL_EXT_bgra", 0 }, { OFF, "GL_EXT_blend_color", F(EXT_blend_color) }, @@ -160,6 +161,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx) "GL_ARB_texture_env_crossbar", "GL_ARB_texture_env_dot3", "GL_ARB_texture_mirrored_repeat", + "GL_ATI_texture_mirror_once", "GL_EXT_blend_color", "GL_EXT_blend_func_separate", "GL_EXT_blend_logic_op", diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 10f8e2bf57d..fde7e3fab2c 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.96 2002/10/11 17:41:04 brianp Exp $ */ +/* $Id: mtypes.h,v 1.97 2002/10/21 15:52:34 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1367,6 +1367,7 @@ struct gl_extensions { GLboolean ARB_texture_env_dot3; GLboolean ARB_texture_mirrored_repeat; GLboolean ARB_window_pos; + GLboolean ATI_texture_mirror_once; GLboolean EXT_blend_color; GLboolean EXT_blend_func_separate; GLboolean EXT_blend_logic_op; diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 0da213404b9..ce40c56f13f 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -1,4 +1,4 @@ -/* $Id: texstate.c,v 1.81 2002/10/17 22:26:06 kschultz Exp $ */ +/* $Id: texstate.c,v 1.82 2002/10/21 15:52:34 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1093,7 +1093,11 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params ) else if (texObj->Target != GL_TEXTURE_RECTANGLE_NV && (eparam == GL_REPEAT || (eparam == GL_MIRRORED_REPEAT_ARB && - ctx->Extensions.ARB_texture_mirrored_repeat))) { + ctx->Extensions.ARB_texture_mirrored_repeat) || + (eparam == GL_MIRROR_CLAMP_ATI && + ctx->Extensions.ATI_texture_mirror_once) || + (eparam == GL_MIRROR_CLAMP_TO_EDGE_ATI && + ctx->Extensions.ATI_texture_mirror_once))) { /* non-rectangle texture */ FLUSH_VERTICES(ctx, _NEW_TEXTURE); texObj->WrapS = eparam; @@ -1116,7 +1120,11 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params ) else if (texObj->Target != GL_TEXTURE_RECTANGLE_NV && (eparam == GL_REPEAT || (eparam == GL_MIRRORED_REPEAT_ARB && - ctx->Extensions.ARB_texture_mirrored_repeat))) { + ctx->Extensions.ARB_texture_mirrored_repeat) || + (eparam == GL_MIRROR_CLAMP_ATI && + ctx->Extensions.ATI_texture_mirror_once) || + (eparam == GL_MIRROR_CLAMP_TO_EDGE_ATI && + ctx->Extensions.ATI_texture_mirror_once))) { /* non-rectangle texture */ FLUSH_VERTICES(ctx, _NEW_TEXTURE); texObj->WrapT = eparam; @@ -1139,7 +1147,11 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params ) else if (texObj->Target != GL_TEXTURE_RECTANGLE_NV && (eparam == GL_REPEAT || (eparam == GL_MIRRORED_REPEAT_ARB && - ctx->Extensions.ARB_texture_mirrored_repeat))) { + ctx->Extensions.ARB_texture_mirrored_repeat) || + (eparam == GL_MIRROR_CLAMP_ATI && + ctx->Extensions.ATI_texture_mirror_once) || + (eparam == GL_MIRROR_CLAMP_TO_EDGE_ATI && + ctx->Extensions.ATI_texture_mirror_once))) { /* non-rectangle texture */ FLUSH_VERTICES(ctx, _NEW_TEXTURE); texObj->WrapR = eparam; |