Revert "common: Fix PBOs for 1D_ARRAY."
authorNeil Roberts <neil@linux.intel.com>
Thu, 26 Feb 2015 12:12:15 +0000 (12:12 +0000)
committerNeil Roberts <neil@linux.intel.com>
Thu, 5 Mar 2015 13:23:10 +0000 (13:23 +0000)
commit7d10d2feee381739eef97f4720cbadbd65bb4fc6
treeceb2028ab2078cbf40b7adf9466eac5ee0ae3ab1
parent29c23644cc8cfe9a1cdd75f79a96a1c9b49d26fa
Revert "common: Fix PBOs for 1D_ARRAY."

This reverts commit 546aba143d13ba3f993ead4cc30b2404abfc0202.

I think the changes to the calls to glBlitFramebuffer from this patch
are no different to what it was doing previously because it used to
set height to 1 before doing the blits. However it was introducing
some problems with the blit for layer 0 because this was no longer
special cased. It didn't fix problems with the yoffset which needs to
be interpreted as a slice offset. I think a better solution would be
to modify the original if statement to cope with the yoffset.

Conflicts:
src/mesa/drivers/common/meta_tex_subimage.c

Cc: "10.5" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
src/mesa/drivers/common/meta_tex_subimage.c