summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2011-10-25 12:10:21 -0700
committerEric Anholt <[email protected]>2011-10-26 12:42:20 -0700
commit638b657f838266e3d4892d06ff53a1c1bee24a9b (patch)
tree9cfaa555ee1df47c57f92a53ec2141f0eceae3cd /src/mesa
parent9c4b02528752eb6392009e41025202fc9f9ca5b3 (diff)
mesa: Apply StripTextureBorder to CopyTexImage as well.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/teximage.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a93ae946ea5..acf7187fded 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2713,6 +2713,16 @@ copyteximage(struct gl_context *ctx, GLuint dims,
texObj = _mesa_get_current_tex_object(ctx, target);
+ if (border && ctx->Const.StripTextureBorder) {
+ x += border;
+ width -= border * 2;
+ if (dims == 2) {
+ y += border;
+ height -= border * 2;
+ }
+ border = 0;
+ }
+
_mesa_lock_texture(ctx, texObj);
{
texImage = _mesa_get_tex_image(ctx, texObj, target, level);