OSDN Git Service

meta: move vertex array enables for mipmap generation
authorBrian Paul <brianp@vmware.com>
Mon, 3 Jun 2013 00:06:17 +0000 (18:06 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 3 Jun 2013 00:06:17 +0000 (18:06 -0600)
commitdcc5b6bfb79261779d85325239d75a2e1f3bec37
treed1251041e368f1ae90e45873b4ab3f5647bb939e
parent8588350dc0fcc124cf3e8104965d8525033e3201
meta: move vertex array enables for mipmap generation

Before, on the second call to GenerateMipmap we were enabling two
vertex arrays for the current vertex array object, rather than
the private generate-mipmap vertex array object.  This caused
things to blow up elsewhere.

This patch moves the array enables into the block where the
generate-mipmap vertex array object is created, as we do in
the setup_ff_generate_mipmap() function.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60518
NOTE: This is a candidate for the stable branches.

Tested-by: core13@gmx.net
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/drivers/common/meta.c