Yes, these commits fix all r600 issues in the sample. Don't forget to backport them to the stable branches.