diff options
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_tex.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_tex.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index c56fd69d86..91f2fd8cce 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/src/mesa/drivers/dri/r200/r200_tex.c @@ -89,13 +89,17 @@ static void r200SetTexWrap( r200TexObjPtr t, GLenum swrap, GLenum twrap, GLenum case GL_MIRRORED_REPEAT: t->pp_txfilter |= R200_CLAMP_S_MIRROR; break; - case GL_MIRROR_CLAMP_ATI: + case GL_MIRROR_CLAMP_EXT: t->pp_txfilter |= R200_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 |= R200_CLAMP_S_MIRROR_CLAMP_LAST; break; + case GL_MIRROR_CLAMP_TO_BORDER_EXT: + t->pp_txfilter |= R200_CLAMP_S_MIRROR_CLAMP_GL; + is_clamp_to_border = GL_TRUE; + break; default: _mesa_problem(NULL, "bad S wrap mode in %s", __FUNCTION__); } @@ -118,13 +122,17 @@ static void r200SetTexWrap( r200TexObjPtr t, GLenum swrap, GLenum twrap, GLenum case GL_MIRRORED_REPEAT: t->pp_txfilter |= R200_CLAMP_T_MIRROR; break; - case GL_MIRROR_CLAMP_ATI: + case GL_MIRROR_CLAMP_EXT: t->pp_txfilter |= R200_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 |= R200_CLAMP_T_MIRROR_CLAMP_LAST; break; + case GL_MIRROR_CLAMP_TO_BORDER_EXT: + t->pp_txfilter |= R200_CLAMP_T_MIRROR_CLAMP_GL; + is_clamp_to_border = GL_TRUE; + break; default: _mesa_problem(NULL, "bad T wrap mode in %s", __FUNCTION__); } @@ -149,13 +157,17 @@ static void r200SetTexWrap( r200TexObjPtr t, GLenum swrap, GLenum twrap, GLenum case GL_MIRRORED_REPEAT: t->pp_txformat_x |= R200_CLAMP_Q_MIRROR; break; - case GL_MIRROR_CLAMP_ATI: + case GL_MIRROR_CLAMP_EXT: t->pp_txformat_x |= R200_CLAMP_Q_MIRROR_CLAMP_GL; is_clamp = GL_TRUE; break; - case GL_MIRROR_CLAMP_TO_EDGE_ATI: + case GL_MIRROR_CLAMP_TO_EDGE_EXT: t->pp_txformat_x |= R200_CLAMP_Q_MIRROR_CLAMP_LAST; break; + case GL_MIRROR_CLAMP_TO_BORDER_EXT: + t->pp_txformat_x |= R200_CLAMP_Q_MIRROR_CLAMP_GL; + is_clamp_to_border = GL_TRUE; + break; default: _mesa_problem(NULL, "bad R wrap mode in %s", __FUNCTION__); } |