diff options
| author | Ian Romanick <[email protected]> | 2004-01-13 16:21:06 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2004-01-13 16:21:06 +0000 |
| commit | e54f2601707a54be8869fb3b0be26503d1c9916e (patch) | |
| tree | 1b3be46ccf37f8be1fda0bce91944830eec39183 /src/mesa/drivers/dri/radeon | |
| parent | b44d4a0d6a7dcc1eebe4f055b98c236e64cb8da1 (diff) | |
Added support for EXT_texture_mirror_clamp.
Diffstat (limited to 'src/mesa/drivers/dri/radeon')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_context.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_tex.c | 16 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index e23b85f1e3d..766d17c6465 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -134,6 +134,7 @@ static const char * const card_extensions[] = "GL_EXT_texture_env_dot3", "GL_EXT_texture_filter_anisotropic", "GL_EXT_texture_lod_bias", + "GL_EXT_texture_mirror_clamp", "GL_ATI_texture_env_combine3", "GL_ATI_texture_mirror_once", "GL_MESA_ycbcr_texture", diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c index 0daae1fab9b..cea0ca2bfc6 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c +++ b/src/mesa/drivers/dri/radeon/radeon_tex.c @@ -88,13 +88,17 @@ static void radeonSetTexWrap( radeonTexObjPtr t, GLenum swrap, GLenum twrap ) case GL_MIRRORED_REPEAT: t->pp_txfilter |= RADEON_CLAMP_S_MIRROR; break; - case GL_MIRROR_CLAMP_ATI: + case GL_MIRROR_CLAMP_EXT: t->pp_txfilter |= RADEON_CLAMP_S_MIRROR_CLAMP_GL; is_clamp = GL_TRUE; break; - case GL_MIRROR_CLAMP_TO_EDGE_ATI: + case GL_MIRROR_CLAMP_TO_EDGE_EXT: t->pp_txfilter |= RADEON_CLAMP_S_MIRROR_CLAMP_LAST; break; + case GL_MIRROR_CLAMP_TO_BORDER_EXT: + t->pp_txfilter |= RADEON_CLAMP_S_MIRROR_CLAMP_GL; + is_clamp_to_border = GL_TRUE; + break; default: _mesa_problem(NULL, "bad S wrap mode in %s", __FUNCTION__); } @@ -117,13 +121,17 @@ static void radeonSetTexWrap( radeonTexObjPtr t, GLenum swrap, GLenum twrap ) case GL_MIRRORED_REPEAT: t->pp_txfilter |= RADEON_CLAMP_T_MIRROR; break; - case GL_MIRROR_CLAMP_ATI: + case GL_MIRROR_CLAMP_EXT: t->pp_txfilter |= RADEON_CLAMP_T_MIRROR_CLAMP_GL; is_clamp = GL_TRUE; break; - case GL_MIRROR_CLAMP_TO_EDGE_ATI: + case GL_MIRROR_CLAMP_TO_EDGE_EXT: t->pp_txfilter |= RADEON_CLAMP_T_MIRROR_CLAMP_LAST; break; + case GL_MIRROR_CLAMP_TO_BORDER_EXT: + t->pp_txfilter |= RADEON_CLAMP_T_MIRROR_CLAMP_GL; + is_clamp_to_border = GL_TRUE; + break; default: _mesa_problem(NULL, "bad T wrap mode in %s", __FUNCTION__); } |