diff options
author | marha <marha@users.sourceforge.net> | 2012-03-08 11:31:50 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-08 11:31:50 +0100 |
commit | ceca11a64938e803d2e0d8ccfc030357c3a0121c (patch) | |
tree | cd5e20638fed3446ac99e4c3d29809ef07b28d18 /mesalib/src/mesa/main/fbobject.c | |
parent | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (diff) | |
parent | b4e09d9f9c2cb930daef6b578e3051e71425ed7f (diff) | |
download | vcxsrv-ceca11a64938e803d2e0d8ccfc030357c3a0121c.tar.gz vcxsrv-ceca11a64938e803d2e0d8ccfc030357c3a0121c.tar.bz2 vcxsrv-ceca11a64938e803d2e0d8ccfc030357c3a0121c.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/main/fbobject.c')
-rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 6ee062d0b..281b1ca2f 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -1994,7 +1994,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, } if ((level < 0) || - (level >= _mesa_max_texture_levels(ctx, texObj->Target))) { + (level >= _mesa_max_texture_levels(ctx, textarget))) { _mesa_error(ctx, GL_INVALID_VALUE, "glFramebufferTexture%sEXT(level)", caller); return; |