Attachment 133732 Details for Bug 102038 – Updated swr patch to fix msaa once new_patch_to_try has been applied.

[patch] Updated swr patch to fix msaa once new_patch_to_try has been applied.

new-msaa-swr.patch (text/plain), 2.16 KB, created by Bruce Cherniak on 2017-08-24 00:19:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bruce Cherniak

Created: 2017-08-24 00:19:34 UTC

Size: 2.16 KB

patch

obsolete

>diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp
>index 3287bc6fee..ca977c1368 100644
>--- a/src/gallium/drivers/swr/swr_screen.cpp
>+++ b/src/gallium/drivers/swr/swr_screen.cpp
>@@ -259,9 +259,9 @@ swr_get_param(struct pipe_screen *screen, enum pipe_cap param)
>     * then disable all MSAA support and go back to old caps. */
>    case PIPE_CAP_TEXTURE_MULTISAMPLE:
>    case PIPE_CAP_MULTISAMPLE_Z_RESOLVE:
>-      return swr_screen(screen)->msaa_max_count ? 1 : 0;
>+      return (swr_screen(screen)->msaa_max_count > 1) ? 1 : 0;
>    case PIPE_CAP_FAKE_SW_MSAA:
>-      return swr_screen(screen)->msaa_max_count ? 0 : 1;
>+      return (swr_screen(screen)->msaa_max_count > 1) ? 0 : 1;
> 
>       /* unsupported features */
>    case PIPE_CAP_ANISOTROPIC_FILTER:
>@@ -1079,22 +1079,22 @@ swr_validate_env_options(struct swr_screen *screen)
>       screen->client_copy_limit = client_copy_limit;
> 
>    /* XXX msaa under development, disable by default for now */
>-   screen->msaa_max_count = 0; /* was SWR_MAX_NUM_MULTISAMPLES; */
>+   screen->msaa_max_count = 1; /* was SWR_MAX_NUM_MULTISAMPLES; */
> 
>    /* validate env override values, within range and power of 2 */
>-   int msaa_max_count = debug_get_num_option("SWR_MSAA_MAX_COUNT", 0);
>-   if (msaa_max_count) {
>-      if ((msaa_max_count < 0) || (msaa_max_count > SWR_MAX_NUM_MULTISAMPLES)
>+   int msaa_max_count = debug_get_num_option("SWR_MSAA_MAX_COUNT", 1);
>+   if (msaa_max_count != 1) {
>+      if ((msaa_max_count < 1) || (msaa_max_count > SWR_MAX_NUM_MULTISAMPLES)
>             || !util_is_power_of_two(msaa_max_count)) {
>          fprintf(stderr, "SWR_MSAA_MAX_COUNT invalid: %d\n", msaa_max_count);
>          fprintf(stderr, "must be power of 2 between 1 and %d" \
>-                         " (or 0 to disable msaa)\n",
>+                         " (or 1 to disable msaa)\n",
>                SWR_MAX_NUM_MULTISAMPLES);
>-         msaa_max_count = 0;
>+         msaa_max_count = 1;
>       }
> 
>       fprintf(stderr, "SWR_MSAA_MAX_COUNT: %d\n", msaa_max_count);
>-      if (!msaa_max_count)
>+      if (msaa_max_count == 1)
>          fprintf(stderr, "(msaa disabled)\n");
> 
>       screen->msaa_max_count = msaa_max_count;

Actions: View | Splinter Review

Attachments on bug 102038: 133247 | 133654 | 133661 | 133687 | 133726 | 133732

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.