diff options
| author | brianp <brianp> | 2002-10-21 16:31:05 +0000 |
|---|---|---|
| committer | brianp <brianp> | 2002-10-21 16:31:05 +0000 |
| commit | b6792bbe184a26296b2787e187a29365c9ea8f31 (patch) | |
| tree | 5d57d929e8d2b17aa310b0c1baf9f3521d9b5870 | |
| parent | 556875524348c86e6503b2c9b8c2aef5af8f2cf8 (diff) | |
added GL_ARB_texture_mirrored_repeat, GL_ARB_texture_border_clamp, GL_ATI_texture_mirror_once, GL_EXT_texture_edge_clamp
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/r200/r200_context.c | 6 | ||||
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/r200/r200_tex.c | 28 |
2 files changed, 33 insertions, 1 deletions
diff --git a/xc/lib/GL/mesa/src/drv/r200/r200_context.c b/xc/lib/GL/mesa/src/drv/r200/r200_context.c index dcff24bd9..030ca71e7 100644 --- a/xc/lib/GL/mesa/src/drv/r200/r200_context.c +++ b/xc/lib/GL/mesa/src/drv/r200/r200_context.c @@ -166,10 +166,15 @@ static void r200InitExtensions( GLcontext *ctx ) _mesa_enable_extension( ctx, "GL_ARB_texture_env_add" ); _mesa_enable_extension( ctx, "GL_ARB_texture_env_combine" ); _mesa_enable_extension( ctx, "GL_ARB_texture_env_dot3" ); + _mesa_enable_extension( ctx, "GL_ARB_texture_mirrored_repeat" ); + _mesa_enable_extension( ctx, "GL_ARB_texture_border_clamp" ); + + _mesa_enable_extension( ctx, "GL_ATI_texture_mirror_once" ); _mesa_enable_extension( ctx, "GL_EXT_blend_logic_op" ); /*_mesa_enable_extension( ctx, "GL_EXT_fog_coord" );*/ _mesa_enable_extension( ctx, "GL_EXT_stencil_wrap" ); + _mesa_enable_extension( ctx, "GL_EXT_texture_edge_clamp" ); _mesa_enable_extension( ctx, "GL_EXT_texture_env_add" ); _mesa_enable_extension( ctx, "GL_EXT_texture_env_combine" ); _mesa_enable_extension( ctx, "GL_EXT_texture_env_dot3" ); @@ -184,7 +189,6 @@ static void r200InitExtensions( GLcontext *ctx ) _mesa_enable_extension( ctx, "GL_MESA_pack_invert" ); _mesa_enable_extension( ctx, "GL_MESA_ycbcr_texture" ); _mesa_enable_extension( ctx, "GL_NV_texture_rectangle" ); - } extern const struct gl_pipeline_stage _r200_render_stage; diff --git a/xc/lib/GL/mesa/src/drv/r200/r200_tex.c b/xc/lib/GL/mesa/src/drv/r200/r200_tex.c index 324ed6433..ac5821e66 100644 --- a/xc/lib/GL/mesa/src/drv/r200/r200_tex.c +++ b/xc/lib/GL/mesa/src/drv/r200/r200_tex.c @@ -68,6 +68,20 @@ static void r200SetTexWrap( r200TexObjPtr t, GLenum swrap, GLenum twrap ) case GL_CLAMP_TO_EDGE: t->pp_txfilter |= R200_CLAMP_S_CLAMP_LAST; break; + case GL_CLAMP_TO_BORDER: + t->pp_txfilter |= R200_CLAMP_S_CLAMP_BORDER; + break; + case GL_MIRRORED_REPEAT_ARB: + t->pp_txfilter |= R200_CLAMP_S_MIRROR; + break; + case GL_MIRROR_CLAMP_ATI: + t->pp_txfilter |= R200_CLAMP_S_MIRROR_CLAMP_BORDER; + break; + case GL_MIRROR_CLAMP_TO_EDGE_ATI: + t->pp_txfilter |= R200_CLAMP_S_MIRROR_CLAMP_LAST; + break; + default: + _mesa_problem(NULL, "bad S wrap mode in r200SetTexWrap"); } switch ( twrap ) { @@ -80,6 +94,20 @@ static void r200SetTexWrap( r200TexObjPtr t, GLenum swrap, GLenum twrap ) case GL_CLAMP_TO_EDGE: t->pp_txfilter |= R200_CLAMP_T_CLAMP_LAST; break; + case GL_CLAMP_TO_BORDER: + t->pp_txfilter |= R200_CLAMP_T_CLAMP_BORDER; + break; + case GL_MIRRORED_REPEAT_ARB: + t->pp_txfilter |= R200_CLAMP_T_MIRROR; + break; + case GL_MIRROR_CLAMP_ATI: + t->pp_txfilter |= R200_CLAMP_T_MIRROR_CLAMP_BORDER; + break; + case GL_MIRROR_CLAMP_TO_EDGE_ATI: + t->pp_txfilter |= R200_CLAMP_T_MIRROR_CLAMP_LAST; + break; + default: + _mesa_problem(NULL, "bad S wrap mode in r200SetTexWrap"); } } |