diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-23 14:53:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-23 14:53:52 +0200 |
| commit | cd27f58626705bcb561115b8e5b0d1430df83fa6 (patch) | |
| tree | 0fea00b96d0cb4a9d55bd0792e5b4634c78864d6 /mesalib/src/mesa/main/attrib.c | |
| parent | 588abfd54eb267dd79fe441e42aee9fc7534eb6e (diff) | |
| parent | b68922d51f52ca6ab9daa0105ef5c57f35bfbdcf (diff) | |
| download | vcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.tar.gz vcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.tar.bz2 vcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/attrib.c')
| -rw-r--r-- | mesalib/src/mesa/main/attrib.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index 9b90b05f7..b114ec941 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -1447,13 +1447,6 @@ restore_array_attrib(struct gl_context *ctx, || _mesa_IsBufferARB(src->ArrayObj->ElementArrayBufferObj->Name)) _mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, src->ArrayObj->ElementArrayBufferObj->Name); - - /* FIXME: Should some bits in ctx->Array->NewState also be set - * FIXME: here? It seems like it should be set to inclusive-or - * FIXME: of the old ArrayObj->_Enabled and the new _Enabled. - * ... just do it. - */ - dest->NewState |= src->ArrayObj->_Enabled | dest->ArrayObj->_Enabled; } /** |