From 92c3ad8caf0d5ae6503826a791123f09e6e5595c Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Wed, 25 Apr 2012 21:47:36 +0200 Subject: [PATCH] nouveau/vieux: only advertise supported texture formats Should fix an assertion seen by users. --- 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; + /* Allocate a hardware channel. */ ret = nouveau_object_new(&context_dev(ctx)->object, 0xbeef0000, NOUVEAU_FIFO_CHANNEL_CLASS, -- 1.7.10