On 11/15/2011 05:55 PM, Eric Anholt wrote:
> This will be used to drive chosing formats and determining framebuffer
> completeness, instead of the bunch of ad-hoc checks we have had until
> now.
> ---
> src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 204
> ++++++++++++++++++++++
> 1 files changed, 204 insertions(+), 0 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> index 0cc6201..f0df730 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> @@ -71,6 +71,210 @@ translate_tex_target(GLenum target)
> }
> }
>
> +struct surface_format_info {
> + bool exists;
> + int sampling;
> + int filtering;
> + int shadow_compare;
> + int chroma_key;
> + int render_target;
> + int alpha_blend;
> + int input_vb;
> + int streamed_output_vb;
> + int color_processing;
> +};
> +
> +/* This macro allows us to write the table almost as it appears in the PRM,
> + * while restructuring it to turn it into the C code we want.
> + */
> +#define SF(sampl, filt, shad, ck, rt, ab, vb, so, color, sf) \
> + [sf] = { true, sampl, filt, shad, ck, rt, ab, vb, so, color },
> +
> +#define Y 0
> +#define x 999
> +/**
> + * This is the table of support for surface (texture, renderbuffer, and
> vertex
> + * buffer, but not depthbuffer) formats across the various hardware
> generations.
> + *
> + * The table is formatted to match the documentation, except that the docs
> have
> + * this ridiculous mapping of Y[*+~^#&] for "supported on DevWhatever". To
> put
> + * it in our table, here's the mapping:
> + *
> + * Y*: 45
> + * Y+: 45 (g45/gm45)
> + * Y~: 50 (gen5)
> + * Y^: 60 (gen6)
> + * Y#: 70 (gen7)
> + *
> + * See page 88 of the Sandybridge PRM VOL4_Part1 PDF.
> + */
> +const struct surface_format_info surface_formats[] = {
> +/* smpl filt shad CK RT AB VB SO color */
> + SF( Y, 50, x, x, Y, Y, Y, Y, x,
> BRW_SURFACEFORMAT_R32G32B32A32_FLOAT)
> + SF( Y, x, x, x, Y, x, Y, Y, x,
> BRW_SURFACEFORMAT_R32G32B32A32_SINT)
> + SF( Y, x, x, x, Y, x, Y, Y, x,
> BRW_SURFACEFORMAT_R32G32B32A32_UINT)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R32G32B32A32_UNORM)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R32G32B32A32_SNORM)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R64G64_FLOAT)
> + SF( Y, 50, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_R32G32B32X32_FLOAT)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R32G32B32A32_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R32G32B32A32_USCALED)
> + SF( Y, 50, x, x, x, x, Y, Y, x, BRW_SURFACEFORMAT_R32G32B32_FLOAT)
> + SF( Y, x, x, x, x, x, Y, Y, x, BRW_SURFACEFORMAT_R32G32B32_SINT)
> + SF( Y, x, x, x, x, x, Y, Y, x, BRW_SURFACEFORMAT_R32G32B32_UINT)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32G32B32_UNORM)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32G32B32_SNORM)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R32G32B32_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R32G32B32_USCALED)
> + SF( Y, Y, x, x, Y, 45, Y, x, 60,
> BRW_SURFACEFORMAT_R16G16B16A16_UNORM)
> + SF( Y, Y, x, x, Y, 60, Y, x, x,
> BRW_SURFACEFORMAT_R16G16B16A16_SNORM)
> + SF( Y, x, x, x, Y, x, Y, x, x,
> BRW_SURFACEFORMAT_R16G16B16A16_SINT)
> + SF( Y, x, x, x, Y, x, Y, x, x,
> BRW_SURFACEFORMAT_R16G16B16A16_UINT)
> + SF( Y, Y, x, x, Y, Y, Y, x, x,
> BRW_SURFACEFORMAT_R16G16B16A16_FLOAT)
> + SF( Y, 50, x, x, Y, Y, Y, Y, x, BRW_SURFACEFORMAT_R32G32_FLOAT)
> + SF( Y, x, x, x, Y, x, Y, Y, x, BRW_SURFACEFORMAT_R32G32_SINT)
> + SF( Y, x, x, x, Y, x, Y, Y, x, BRW_SURFACEFORMAT_R32G32_UINT)
> + SF( Y, 50, Y, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS)
> + SF( Y, x, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_X32_TYPELESS_G8X24_UINT)
> + SF( Y, 50, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_L32A32_FLOAT)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32G32_UNORM)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32G32_SNORM)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R64_FLOAT)
> + SF( Y, Y, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_R16G16B16X16_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_R16G16B16X16_FLOAT)
> + SF( Y, 50, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_A32X32_FLOAT)
> + SF( Y, 50, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_L32X32_FLOAT)
> + SF( Y, 50, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_I32X32_FLOAT)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R16G16B16A16_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R16G16B16A16_USCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32G32_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32G32_USCALED)
> + SF( Y, Y, x, Y, Y, Y, Y, x, 60, BRW_SURFACEFORMAT_B8G8R8A8_UNORM)
> + SF( Y, Y, x, x, Y, Y, x, x, x,
> BRW_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB)
> +/* smpl filt shad CK RT AB VB SO color */
> + SF( Y, Y, x, x, Y, Y, Y, x, 60,
> BRW_SURFACEFORMAT_R10G10B10A2_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, 60,
> BRW_SURFACEFORMAT_R10G10B10A2_UNORM_SRGB)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R10G10B10A2_UINT)
> + SF( Y, Y, x, x, x, Y, Y, x, x,
> BRW_SURFACEFORMAT_R10G10B10_SNORM_A2_UNORM)
> + SF( Y, Y, x, x, Y, Y, Y, x, 60, BRW_SURFACEFORMAT_R8G8B8A8_UNORM)
> + SF( Y, Y, x, x, Y, Y, x, x, 60,
> BRW_SURFACEFORMAT_R8G8B8A8_UNORM_SRGB)
> + SF( Y, Y, x, x, Y, 60, Y, x, x, BRW_SURFACEFORMAT_R8G8B8A8_SNORM)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R8G8B8A8_SINT)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R8G8B8A8_UINT)
> + SF( Y, Y, x, x, Y, 45, Y, x, x, BRW_SURFACEFORMAT_R16G16_UNORM)
> + SF( Y, Y, x, x, Y, 60, Y, x, x, BRW_SURFACEFORMAT_R16G16_SNORM)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R16G16_SINT)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R16G16_UINT)
> + SF( Y, Y, x, x, Y, Y, Y, x, x, BRW_SURFACEFORMAT_R16G16_FLOAT)
> + SF( Y, Y, x, x, Y, Y, x, x, 60,
> BRW_SURFACEFORMAT_B10G10R10A2_UNORM)
> + SF( Y, Y, x, x, Y, Y, x, x, 60,
> BRW_SURFACEFORMAT_B10G10R10A2_UNORM_SRGB)
> + SF( Y, Y, x, x, Y, Y, Y, x, x, BRW_SURFACEFORMAT_R11G11B10_FLOAT)
> + SF( Y, x, x, x, Y, x, Y, Y, x, BRW_SURFACEFORMAT_R32_SINT)
> + SF( Y, x, x, x, Y, x, Y, Y, x, BRW_SURFACEFORMAT_R32_UINT)
> + SF( Y, 50, Y, x, Y, Y, Y, Y, x, BRW_SURFACEFORMAT_R32_FLOAT)
> + SF( Y, 50, Y, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_R24_UNORM_X8_TYPELESS)
> + SF( Y, x, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_X24_TYPELESS_G8_UINT)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_L16A16_UNORM)
> + SF( Y, 50, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_I24X8_UNORM)
> + SF( Y, 50, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_L24X8_UNORM)
> + SF( Y, 50, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_A24X8_UNORM)
> + SF( Y, 50, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_I32_FLOAT)
> + SF( Y, 50, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_L32_FLOAT)
> + SF( Y, 50, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_A32_FLOAT)
> + SF( Y, Y, x, Y, x, x, x, x, 60, BRW_SURFACEFORMAT_B8G8R8X8_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_B8G8R8X8_UNORM_SRGB)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_R8G8B8X8_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_R8G8B8X8_UNORM_SRGB)
> + SF( Y, Y, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_R9G9B9E5_SHAREDEXP)
> + SF( Y, Y, x, x, x, x, x, x, x,
> BRW_SURFACEFORMAT_B10G10R10X2_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_L16A16_FLOAT)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32_UNORM)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32_SNORM)
> +/* smpl filt shad CK RT AB VB SO color */
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R10G10B10X2_USCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8G8B8A8_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8G8B8A8_USCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R16G16_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R16G16_USCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R32_USCALED)
> + SF( Y, Y, x, Y, Y, Y, x, x, x, BRW_SURFACEFORMAT_B5G6R5_UNORM)
> + SF( Y, Y, x, x, Y, Y, x, x, x,
> BRW_SURFACEFORMAT_B5G6R5_UNORM_SRGB)
> + SF( Y, Y, x, Y, Y, Y, x, x, x, BRW_SURFACEFORMAT_B5G5R5A1_UNORM)
> + SF( Y, Y, x, x, Y, Y, x, x, x,
> BRW_SURFACEFORMAT_B5G5R5A1_UNORM_SRGB)
> + SF( Y, Y, x, Y, Y, Y, x, x, x, BRW_SURFACEFORMAT_B4G4R4A4_UNORM)
> + SF( Y, Y, x, x, Y, Y, x, x, x,
> BRW_SURFACEFORMAT_B4G4R4A4_UNORM_SRGB)
> + SF( Y, Y, x, x, Y, Y, Y, x, x, BRW_SURFACEFORMAT_R8G8_UNORM)
> + SF( Y, Y, x, Y, Y, 60, Y, x, x, BRW_SURFACEFORMAT_R8G8_SNORM)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R8G8_SINT)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R8G8_UINT)
> + SF( Y, Y, Y, x, Y, 45, Y, x, 70, BRW_SURFACEFORMAT_R16_UNORM)
Gah...Tricksy BSpecses...they split this lovely table into three different
places.
That said, I managed to find where this 70 comes from. *check of approval* :)
> + SF( Y, Y, x, x, Y, 60, Y, x, x, BRW_SURFACEFORMAT_R16_SNORM)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R16_SINT)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R16_UINT)
> + SF( Y, Y, x, x, Y, Y, Y, x, x, BRW_SURFACEFORMAT_R16_FLOAT)
> + SF( Y, Y, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_I16_UNORM)
> + SF( Y, Y, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_L16_UNORM)
> + SF( Y, Y, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_A16_UNORM)
> + SF( Y, Y, x, Y, x, x, x, x, x, BRW_SURFACEFORMAT_L8A8_UNORM)
> + SF( Y, Y, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_I16_FLOAT)
> + SF( Y, Y, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_L16_FLOAT)
> + SF( Y, Y, Y, x, x, x, x, x, x, BRW_SURFACEFORMAT_A16_FLOAT)
> + SF(45, 45, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_L8A8_UNORM_SRGB)
> + SF( Y, Y, x, Y, x, x, x, x, x,
> BRW_SURFACEFORMAT_R5G5_SNORM_B6_UNORM)
> + SF( x, x, x, x, Y, Y, x, x, x, BRW_SURFACEFORMAT_B5G5R5X1_UNORM)
> + SF( x, x, x, x, Y, Y, x, x, x,
> BRW_SURFACEFORMAT_B5G5R5X1_UNORM_SRGB)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8G8_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8G8_USCALED)
> +/* smpl filt shad CK RT AB VB SO color */
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R16_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R16_USCALED)
> + SF( Y, Y, x, 45, Y, Y, Y, x, x, BRW_SURFACEFORMAT_R8_UNORM)
> + SF( Y, Y, x, x, Y, 60, Y, x, x, BRW_SURFACEFORMAT_R8_SNORM)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R8_SINT)
> + SF( Y, x, x, x, Y, x, Y, x, x, BRW_SURFACEFORMAT_R8_UINT)
> + SF( Y, Y, x, Y, Y, Y, x, x, x, BRW_SURFACEFORMAT_A8_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_I8_UNORM)
> + SF( Y, Y, x, Y, x, x, x, x, x, BRW_SURFACEFORMAT_L8_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_P4A4_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_A4P4_UNORM)
You should probably kill the P4A4 and A4P4 entries:
1. We don't care about paletted textures.
2. You already omitted A8P8_UNORM, P8A8_UNORM, P8_UNORM, and P2_UNORM.
3. I'm not sure 'Y' is correct here: The PRM lists it as Y for palette 0, but 45
for palette 1. If palette1 didn't exist before G45 (seems likely), then I
suppose this is fine. If not, you'd have to encode that in the table
somehow...(and did I mention we don't care?)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8_USCALED)
> + SF(45, 45, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_L8_UNORM_SRGB)
> + SF(45, 45, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_DXT1_RGB_SRGB)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_R1_UINT)
> + SF( Y, Y, x, Y, Y, x, x, x, 60, BRW_SURFACEFORMAT_YCRCB_NORMAL)
> + SF( Y, Y, x, Y, Y, x, x, x, 60, BRW_SURFACEFORMAT_YCRCB_SWAPUVY)
> + SF( Y, Y, x, Y, x, x, x, x, x, BRW_SURFACEFORMAT_BC1_UNORM)
> + SF( Y, Y, x, Y, x, x, x, x, x, BRW_SURFACEFORMAT_BC2_UNORM)
> + SF( Y, Y, x, Y, x, x, x, x, x, BRW_SURFACEFORMAT_BC3_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_BC4_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_BC5_UNORM)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_BC1_UNORM_SRGB)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_BC2_UNORM_SRGB)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_BC3_UNORM_SRGB)
> + SF( Y, x, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_MONO8)
> + SF( Y, Y, x, x, Y, x, x, x, 60, BRW_SURFACEFORMAT_YCRCB_SWAPUV)
> + SF( Y, Y, x, x, Y, x, x, x, 60, BRW_SURFACEFORMAT_YCRCB_SWAPY)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_DXT1_RGB)
> +/* smpl filt shad CK RT AB VB SO color */
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_FXT1)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8G8B8_UNORM)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8G8B8_SNORM)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8G8B8_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R8G8B8_USCALED)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R64G64B64A64_FLOAT)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R64G64B64_FLOAT)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_BC4_SNORM)
> + SF( Y, Y, x, x, x, x, x, x, x, BRW_SURFACEFORMAT_BC5_SNORM)
I think you missed one here:
SF(50, 50, x, x, x, x, 60, x, x, BRW_SURFACEFORMAT_R16G16B16_FLOAT)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R16G16B16_UNORM)
> + SF( x, x, x, x, x, x, Y, x, x, BRW_SURFACEFORMAT_R16G16B16_SNORM)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R16G16B16_SSCALED)
> + SF( x, x, x, x, x, x, Y, x, x,
> BRW_SURFACEFORMAT_R16G16B16_USCALED)
> +};
> +#undef x
> +#undef Y
> +
> uint32_t
> brw_format_for_mesa_format(gl_format mesa_format)
> {
Thanks Eric, this looks great! I checked it pretty carefully, so you get a
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
with a high degree of confidence. Nice job entering all that without mistakes.
:)
I'll review the rest of the series soon.
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
