wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> (cherry picked from commit a25c47f5) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported.
160a063c · Matteo Bruni · Michael Stefaniuc · 731a32be · 160a063c · 160a063c
Commit 160a063c authored Jan 26, 2016 by Matteo Bruni Committed by Michael Stefaniuc Apr 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

directx.c dlls/wined3d/directx.c +1 -1

surface.c dlls/wined3d/surface.c +1 -1

No files found.
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4426,7 +4426,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3
    if (quality_levels)
    {
        if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE)
-            *quality_levels = gl_info->limits.samples;
+            *quality_levels = wined3d_log2i(gl_info->limits.samples);
        else
            *quality_levels = 1;
    }

--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2887,7 +2887,7 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win
         * AMD has a similar feature called Enhanced Quality Anti-Aliasing (EQAA),
         * but it does not have an equivalent OpenGL extension. */
        if (surface->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE)
-            samples = surface->resource.multisample_quality;
+            samples = 1u << (surface->resource.multisample_quality + 1);
        else
            samples = surface->resource.multisample_type;