diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-13 08:07:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-13 08:07:38 +0100 |
| commit | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (patch) | |
| tree | 064121d82e7edce83e6d4809d6e4a92b1a3e84d6 /mesalib/src/mesa/main/varray.c | |
| parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
| download | vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.tar.gz vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.tar.bz2 vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.zip | |
mesa xserver pixman git update 9 nov 2013
xserver commit 4a251f5883b042cd902c192060a0be2b11148f2b
pixman commit 8487dfbcd056eff066939dc253fcf361b391592a
mesa commit e0489531455623aa21aa565b2c890362d8437f23
Diffstat (limited to 'mesalib/src/mesa/main/varray.c')
| -rw-r--r-- | mesalib/src/mesa/main/varray.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c index d17d698d3..0f38270d5 100644 --- a/mesalib/src/mesa/main/varray.c +++ b/mesalib/src/mesa/main/varray.c @@ -390,11 +390,6 @@ update_array(struct gl_context *ctx, return; } - if (!update_array_format(ctx, func, attrib, legalTypesMask, sizeMin, sizeMax, - size, type, normalized, integer, 0)) { - return; - } - if (stride < 0) { _mesa_error( ctx, GL_INVALID_VALUE, "%s(stride=%d)", func, stride ); return; @@ -418,6 +413,11 @@ update_array(struct gl_context *ctx, return; } + if (!update_array_format(ctx, func, attrib, legalTypesMask, sizeMin, + sizeMax, size, type, normalized, integer, 0)) { + return; + } + /* Reset the vertex attrib binding */ vertex_attrib_binding(ctx, attrib, attrib); |