projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c4b025
)
mesa: Apply StripTextureBorder to CopyTexImage as well.
author
Eric Anholt
<eric@anholt.net>
Tue, 25 Oct 2011 19:10:21 +0000
(12:10 -0700)
committer
Eric Anholt
<eric@anholt.net>
Wed, 26 Oct 2011 19:42:20 +0000
(12:42 -0700)
Reviewed-by: Brian Paul <brianp@vmware.com>
src/mesa/main/teximage.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/teximage.c
b/src/mesa/main/teximage.c
index
a93ae94
..
acf7187
100644
(file)
--- 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);