From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Tue, 30 Aug 2011 21:44:27 +0000 (+0200)
Subject: nv50,nvc0: fix multisample format hack
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=66e8d223b61dc034fb941e7d704a85ee44d7bbcc;p=mesa.git

nv50,nvc0: fix multisample format hack

Advertising different format support based on sample count was a
bad idea, it made resolve to window work, but resolve to anything
else would fail.

See 9f4998639c3c47f0b7ee3e2a29b7f3609d3f7796.
---

diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c
index b1d0b1c54a5..235cd82c643 100644
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -59,7 +59,7 @@ nv50_screen_is_format_supported(struct pipe_screen *pscreen,
    case PIPE_FORMAT_R8G8B8A8_UNORM:
    case PIPE_FORMAT_R8G8B8X8_UNORM:
       /* HACK: GL requires equal formats for MS resolve and window is BGRA */
-      if (sample_count > 1)
+      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 204887d2e8b..d3027de156c 100644
--- a/src/gallium/drivers/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nvc0/nvc0_screen.c
@@ -50,7 +50,7 @@ nvc0_screen_is_format_supported(struct pipe_screen *pscreen,
    case PIPE_FORMAT_R8G8B8A8_UNORM:
    case PIPE_FORMAT_R8G8B8X8_UNORM:
       /* HACK: GL requires equal formats for MS resolve and window is BGRA */
-      if (sample_count > 1)
+      if (bindings & PIPE_BIND_RENDER_TARGET)
          return FALSE;
    default:
       break;