[Nouveau] [PATCH] nouveau/vieux: only advertise supported texture formats

[Francisco Jerez]

Lucas Stach <dev at lynxeye.de> writes:

> Fixes an assertion seen by users.
>
> Signed-off-by: Lucas Stach <dev at lynxeye.de>
> Tested-by: JohnDoe_71Rus on irc
> ---
>  src/mesa/drivers/dri/nouveau/nouveau_context.c |    9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
> index 4845767..46c0d70 100644
> --- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
> +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
> @@ -117,6 +117,15 @@ nouveau_context_init(struct gl_context *ctx, struct nouveau_screen *screen,
>  	nouveau_span_functions_init(ctx);
>  	_mesa_allow_light_in_model(ctx, GL_FALSE);
>  
> +	/* only advertise supported texture formats */
> +	memset(&ctx->TextureFormatSupported, 0,
> +	       sizeof(ctx->TextureFormatSupported));
> +	ctx->TextureFormatSupported[MESA_FORMAT_XRGB8888] = true;
> +	ctx->TextureFormatSupported[MESA_FORMAT_ARGB8888] = true;
> +	ctx->TextureFormatSupported[MESA_FORMAT_RGB565] = true;
> +	ctx->TextureFormatSupported[MESA_FORMAT_Z16] = true;
> +	ctx->TextureFormatSupported[MESA_FORMAT_Z24_S8] = true;
> +
Hi Lucas,

It's not obvious to me how this works.  AFAIK nouveau doesn't make use
of this array.  And even if it did, the texture formats you're listing
aren't the supported ones.

>  	/* Allocate a hardware channel. */
>  	ret = nouveau_object_new(&context_dev(ctx)->object, 0xbeef0000,
>  				 NOUVEAU_FIFO_CHANNEL_CLASS,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 229 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/nouveau/attachments/20120430/3fa8530f/attachment.pgp>