[Mesa-dev] [PATCH 5/8] mesa: fill in Z32_FLOAT_X24S8 in _mesa_format_matches_format_and_type

[Ian Romanick]

On 01/29/2013 05:43 AM, Marek Olšák wrote:
> ---
>   src/mesa/main/formats.c |    3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
> index b86fb9e..9c1a0ff 100644
> --- a/src/mesa/main/formats.c
> +++ b/src/mesa/main/formats.c
> @@ -3351,7 +3351,8 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
>         return format == GL_DEPTH_COMPONENT && type == GL_FLOAT && !swapBytes;
>
>      case MESA_FORMAT_Z32_FLOAT_X24S8:
> -      return GL_FALSE;
> +      return format == GL_DEPTH_STENCIL &&
> +             type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV && !swapBytes;
>
>      case MESA_FORMAT_XRGB4444_UNORM:
>      case MESA_FORMAT_XRGB1555_UNORM:
>

This patch didn't apply for me... these last _UNORM cases don't seem to 
exist in master.  Do these patches require some previous series?