[Mesa-dev] [PATCH] i965: Fix S8 and X8 reversal in brw_depthbuffer_format refactor.

[Ian Romanick]

On 02/21/2014 12:23 AM, Kenneth Graunke wrote:
> In commit 09d9a8913e8c28fc4c1c60d7da85a2f093786894, I accidentally
> botched the X8 and S8 cases.  (I wrote this patch before realizing that
> X8 and S8 had been swapped in the big MESA_FORMAT rename, and apparently
> didn't rebase it properly after fixing that...)
>
> Fixes regressions in 13 Piglit tests on Ironlake.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75291
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>   src/mesa/drivers/dri/i965/brw_surface_formats.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> No piglit changes on Ivybridge.
>
> diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
> index b2c36d9..9acece5 100644
> --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
> +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
> @@ -741,7 +741,7 @@ brw_depth_format(struct brw_context *brw, mesa_format format)
>         return BRW_DEPTHFORMAT_D16_UNORM;
>      case MESA_FORMAT_Z_FLOAT32:
>         return BRW_DEPTHFORMAT_D32_FLOAT;
> -   case MESA_FORMAT_Z24_UNORM_S8_UINT:
> +   case MESA_FORMAT_Z24_UNORM_X8_UINT:
>         if (brw->gen >= 6) {
>            return BRW_DEPTHFORMAT_D24_UNORM_X8_UINT;
>         } else {
> @@ -761,8 +761,8 @@ brw_depth_format(struct brw_context *brw, mesa_format format)
>             */
>            return BRW_DEPTHFORMAT_D24_UNORM_S8_UINT;
>         }
> -   case MESA_FORMAT_Z24_UNORM_X8_UINT:
> -      return BRW_DEPTHFORMAT_D24_UNORM_X8_UINT;
> +   case MESA_FORMAT_Z24_UNORM_S8_UINT:
> +      return BRW_DEPTHFORMAT_D24_UNORM_S8_UINT;
>      case MESA_FORMAT_Z32_FLOAT_S8X24_UINT:
>         return BRW_DEPTHFORMAT_D32_FLOAT_S8X24_UINT;
>      default:
>