These two patches fix a number of piglit OpenCL test failures on my HD6850 (Barts). There are no piglit CL test regressions and the llvm make check runs without any unexpected failures.