From 80eef069f032af921554ba0e03062d84488d3f6c Mon Sep 17 00:00:00 2001 From: Christoph Bumiller Date: Wed, 3 Apr 2013 13:19:15 +0200 Subject: [PATCH] nv50,nvc0: remove MS resolve formats hack Mesa now allows BlitFramebuffer resolve between RGBA and BGRA. --- src/gallium/drivers/nv50/nv50_screen.c | 5 ----- src/gallium/drivers/nvc0/nvc0_screen.c | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c index 53eeeb6302a..55081beb300 100644 --- a/src/gallium/drivers/nv50/nv50_screen.c +++ b/src/gallium/drivers/nv50/nv50_screen.c @@ -65,11 +65,6 @@ nv50_screen_is_format_supported(struct pipe_screen *pscreen, if (nv50_screen(pscreen)->tesla->oclass < NVA0_3D_CLASS) return FALSE; break; - case PIPE_FORMAT_R8G8B8A8_UNORM: - case PIPE_FORMAT_R8G8B8X8_UNORM: - /* HACK: GL requires equal formats for MS resolve and window is BGRA */ - if (bindings & PIPE_BIND_RENDER_TARGET) - return FALSE; default: break; } diff --git a/src/gallium/drivers/nvc0/nvc0_screen.c b/src/gallium/drivers/nvc0/nvc0_screen.c index a46fb388e64..f2dd65ba0ca 100644 --- a/src/gallium/drivers/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nvc0/nvc0_screen.c @@ -51,16 +51,6 @@ nvc0_screen_is_format_supported(struct pipe_screen *pscreen, if (!util_format_is_supported(format, bindings)) return FALSE; - switch (format) { - case PIPE_FORMAT_R8G8B8A8_UNORM: - case PIPE_FORMAT_R8G8B8X8_UNORM: - /* HACK: GL requires equal formats for MS resolve and window is BGRA */ - if (bindings & PIPE_BIND_RENDER_TARGET) - return FALSE; - default: - break; - } - if ((bindings & PIPE_BIND_SAMPLER_VIEW) && (target != PIPE_BUFFER)) if (util_format_get_blocksizebits(format) == 3 * 32) return FALSE; -- 2.30.2