r600: untangle the mixup with the drawing regression
As clarified in #4680 (closed) there was a bit of a mixup in #4657 (closed) and testing it about which commit was actually responsible for the regression, so revert the right commit and reinstate the reverted one that fixes a number of GLES CTS tests.