diff options
author | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
commit | e2b908c356746281aba48128da7dc15a28f5a773 (patch) | |
tree | 5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/src/mesa/main/attrib.c | |
parent | 1fc1b7f67928082b9e922463be25c232d9bcba6a (diff) | |
parent | 704e01fc69ebf6302aa1876906805147248abdaa (diff) | |
download | vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2 vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/attrib.c')
-rw-r--r-- | mesalib/src/mesa/main/attrib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index 363213c71..34cee5e32 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -790,6 +790,8 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) !ctx->Extensions.MESA_texture_array) {
continue;
}
+ else if (obj->Target == GL_TEXTURE_BUFFER)
+ continue;
target = obj->Target;
|